diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2017-11-03 11:29:00 +0200 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2017-11-03 11:29:00 +0200 |
| commit | 6f773a78fff93fa819cc68758b9ceba31858d7b8 (patch) | |
| tree | 175fb85cf537c1c6b283dc338858fb12b0e08d06 | |
| parent | a9f0aa618da1dd6b6a2c73f72e95aafb133889ff (diff) | |
| parent | 1bb52dd11b5ccf927a468b5c1f2ae40e007a3990 (diff) | |
| download | egawk-6f773a78fff93fa819cc68758b9ceba31858d7b8.tar.gz egawk-6f773a78fff93fa819cc68758b9ceba31858d7b8.tar.bz2 egawk-6f773a78fff93fa819cc68758b9ceba31858d7b8.zip | |
Merge branch 'gawk-4.2-stable'
| -rw-r--r-- | pc/ChangeLog | 10 | ||||
| -rw-r--r-- | pc/Makefile | 6 | ||||
| -rw-r--r-- | pc/Makefile.tst | 2 |
3 files changed, 16 insertions, 2 deletions
diff --git a/pc/ChangeLog b/pc/ChangeLog index 800e6790..bc1e3a3e 100644 --- a/pc/ChangeLog +++ b/pc/ChangeLog @@ -1,3 +1,13 @@ +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. + 2017-10-21 KO Myung-Hun <komh78@gmail.com> * gawkmisc.pc (os2_dlsym, os2_fixdllname, os2_dlopen) [__KLIBC__]: 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 diff --git a/pc/Makefile.tst b/pc/Makefile.tst index b0686fe6..9c3ec144 100644 --- a/pc/Makefile.tst +++ b/pc/Makefile.tst @@ -1175,7 +1175,7 @@ getfile: readdir: @if [ "`uname`" = Linux ] && [ "`stat -f . 2>/dev/null | awk 'NR == 2 { print $$NF }'`" = nfs ]; then \ - echo This test may fail on GNU/Linux systems when run on an NFS filesystem.; \ + echo This test may fail on GNU/Linux systems when run on NFS or JFS filesystems.; \ echo If it does, try rerunning on an ext'[234]' filesystem. ; \ fi @echo $@ |