From eabd61434b78152427a9a11d762076377e5ce9cb Mon Sep 17 00:00:00 2001 From: Scott Deifik Date: Fri, 3 Nov 2017 11:04:50 +0200 Subject: Minor sync change in pc/Makefile.tst. --- pc/ChangeLog | 5 +++++ pc/Makefile.tst | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/pc/ChangeLog b/pc/ChangeLog index 800e6790..5a2e04b7 100644 --- a/pc/ChangeLog +++ b/pc/ChangeLog @@ -1,3 +1,8 @@ +2017-11-03 Eli Zaretskii + + * Makefile.tst (readdir): Make the message identical with + test/Makefile.in. + 2017-10-21 KO Myung-Hun * gawkmisc.pc (os2_dlsym, os2_fixdllname, os2_dlopen) [__KLIBC__]: 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 $@ -- cgit v1.2.3 From 1bb52dd11b5ccf927a468b5c1f2ae40e007a3990 Mon Sep 17 00:00:00 2001 From: Juan Manuel Guerrero Date: Fri, 3 Nov 2017 11:13:45 +0200 Subject: Fix "make install" of the DJGPP build. --- pc/ChangeLog | 7 ++++++- pc/Makefile | 6 +++++- 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 +2017-11-03 Juan Manuel Guerrero + + * Makefile (install1): Copy gawk.exe to awk.exe before copying + *awk.exe. + +2017-11-03 Scott Deifik * 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 -- cgit v1.2.3