summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBoris Nagaev <bnagaev@gmail.com>2016-08-22 20:01:13 (GMT)
committerBoris Nagaev <bnagaev@gmail.com>2016-08-27 09:31:30 (GMT)
commitd0e424038e16a928527588f3d7626f57d34fd486 (patch)
tree28e398a59fc75eae9e9c731071ed8abf9bd06293
parent6adb5ade12836064d271868ce5fe16a3e0cc779b (diff)
downloadmxe-d0e424038e16a928527588f3d7626f57d34fd486.zip
mxe-d0e424038e16a928527588f3d7626f57d34fd486.tar.gz
mxe-d0e424038e16a928527588f3d7626f57d34fd486.tar.bz2
rename doc/ to docs/
See https://github.com/mxe/mxe/issues/1500
-rw-r--r--Makefile2
-rw-r--r--docs/gmsl.html (renamed from doc/gmsl.html)0
-rw-r--r--docs/release-process.txt (renamed from doc/release-process.txt)0
-rw-r--r--index.html2
-rwxr-xr-xtools/build-pkg.lua2
-rwxr-xr-xtools/update-gmsl4
6 files changed, 5 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index d97fa43..8084b23 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ TOP_DIR := $(patsubst %/,%,$(dir $(MAKEFILE)))
EXT_DIR := $(TOP_DIR)/ext
# GNU Make Standard Library (http://gmsl.sourceforge.net/)
-# See doc/gmsl.html for further information
+# See docs/gmsl.html for further information
include $(EXT_DIR)/gmsl
MXE_TRIPLETS := i686-w64-mingw32 x86_64-w64-mingw32
diff --git a/doc/gmsl.html b/docs/gmsl.html
index 494d7f3..494d7f3 100644
--- a/doc/gmsl.html
+++ b/docs/gmsl.html
diff --git a/doc/release-process.txt b/docs/release-process.txt
index 57867c1..57867c1 100644
--- a/doc/release-process.txt
+++ b/docs/release-process.txt
diff --git a/index.html b/index.html
index ad0a17c..aa0a560 100644
--- a/index.html
+++ b/index.html
@@ -2942,7 +2942,7 @@ local-pkg-list: $(LOCAL_PKG_LIST)</pre>
</p>
<p>
- The <a href="doc/gmsl.html">GNU Make Standard Library</a> is also
+ The <a href="docs/gmsl.html">GNU Make Standard Library</a> is also
available (though it should be unnecessary for most packages).
</p>
diff --git a/tools/build-pkg.lua b/tools/build-pkg.lua
index ce3d263..8ec32c8 100755
--- a/tools/build-pkg.lua
+++ b/tools/build-pkg.lua
@@ -1031,7 +1031,7 @@ local function makeMxeSourcePackage()
'patch.mk',
'README.md',
'assets',
- 'doc',
+ 'docs',
'ext',
'index.html',
'src',
diff --git a/tools/update-gmsl b/tools/update-gmsl
index ff37987..bb5b52b 100755
--- a/tools/update-gmsl
+++ b/tools/update-gmsl
@@ -26,10 +26,10 @@ if [ $current_version != $latest_version ]; then
$WGET -q -O tmp-gmsl.tar.gz \
"http://downloads.sourceforge.net/project/gmsl/GNU%20Make%20Standard%20Library/v${latest_version}/gmsl-${latest_version}.tar.gz"
tar xzf tmp-gmsl.tar.gz
- rm -f ext/*gmsl doc/gmsl*
+ rm -f ext/*gmsl docs/gmsl*
cp -a gmsl-${latest_version}/gmsl ext/
cp -a gmsl-${latest_version}/__gmsl ext/
- cp -a gmsl-${latest_version}/index.html doc/gmsl.html
+ cp -a gmsl-${latest_version}/index.html docs/gmsl.html
clean
else
echo "No new version available: $current_version"