aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuan Manuel Guerrero <juan.guerrero@gmx.de>2017-11-03 11:13:45 +0200
committerEli Zaretskii <eliz@gnu.org>2017-11-03 11:13:45 +0200
commit1bb52dd11b5ccf927a468b5c1f2ae40e007a3990 (patch)
treeb67c156442423ce1e9c53e196a17b54d13de29a4
parenteabd61434b78152427a9a11d762076377e5ce9cb (diff)
downloadegawk-1bb52dd11b5ccf927a468b5c1f2ae40e007a3990.tar.gz
egawk-1bb52dd11b5ccf927a468b5c1f2ae40e007a3990.tar.bz2
egawk-1bb52dd11b5ccf927a468b5c1f2ae40e007a3990.zip
Fix "make install" of the DJGPP build.
-rw-r--r--pc/ChangeLog7
-rw-r--r--pc/Makefile6
2 files changed, 11 insertions, 2 deletions
diff --git a/pc/ChangeLog b/pc/ChangeLog
index 5a2e04b7..bc1e3a3e 100644
--- a/pc/ChangeLog
+++ b/pc/ChangeLog
@@ -1,4 +1,9 @@
-2017-11-03 Eli Zaretskii <eliz@gnu.org>
+2017-11-03 Juan Manuel Guerrero <juan.guerrero@gmx.de>
+
+ * Makefile (install1): Copy gawk.exe to awk.exe before copying
+ *awk.exe.
+
+2017-11-03 Scott Deifik <scottd.mail@sbcglobal.net>
* Makefile.tst (readdir): Make the message identical with
test/Makefile.in.
diff --git a/pc/Makefile b/pc/Makefile
index be5e052e..bdec371c 100644
--- a/pc/Makefile
+++ b/pc/Makefile
@@ -288,6 +288,10 @@ popen$O: popen.h
install: install$(install)
-$(MAKE) -C extension install-extensions
+# Note: The line that copies gawk.exe into awk.exe should come before
+# the line after it, which copies *awk.exe, to support the DJGPP "hard
+# link to executables" feature, whereby awk.exe is actually a small
+# stub that invokes gawk.exe.
install1:
echo extproc sh $(prefix)/bin/igawk.cmd > igawk.cmd
echo shift >> igawk.cmd
@@ -299,8 +303,8 @@ install1:
-mkdir "$(prefix)/share"
-mkdir "$(prefix)/share/man"
-mkdir "$(pkgdatadir)" "$(prefix)/share/man/man1" "$(prefix)/share/info"
- cp *awk.exe igawk.bat igawk.cmd pc/awklib/igawk $(prefix)/bin
cp gawk.exe $(prefix)/bin/awk.exe
+ cp *awk.exe igawk.bat igawk.cmd pc/awklib/igawk $(prefix)/bin
cp gawkapi.h $(prefix)/include
cp awklib/eg/lib/* pc/awklib/igawk.awk $(pkgdatadir)
cp doc/*.1 $(prefix)/share/man/man1