aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnold D. Robbins <arnold@skeeve.com>2017-08-23 08:36:52 +0300
committerArnold D. Robbins <arnold@skeeve.com>2017-08-23 08:36:52 +0300
commitd8f8817921b8ff1fb41f79f6ecf12cce42441e9f (patch)
treea84c0da7e8d28ed0cfb009618a49b9a313043dad
parentb33eb7a4bf226ce8d9f568927f875afe290d9b06 (diff)
parentb42cad3ddb49b1a19c81785c9916a789b7d32efc (diff)
downloadegawk-d8f8817921b8ff1fb41f79f6ecf12cce42441e9f.tar.gz
egawk-d8f8817921b8ff1fb41f79f6ecf12cce42441e9f.tar.bz2
egawk-d8f8817921b8ff1fb41f79f6ecf12cce42441e9f.zip
Merge branch 'master' into feature/fix-comments
-rw-r--r--ChangeLog4
-rw-r--r--README.git10
-rw-r--r--README_d/ChangeLog4
-rw-r--r--README_d/README.alpine15
-rw-r--r--pc/ChangeLog4
-rw-r--r--pc/Makefile.tst2
-rw-r--r--test/ChangeLog6
-rw-r--r--test/Makefile.am2
-rw-r--r--test/Makefile.in2
9 files changed, 41 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index b957045f..0303657a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2017-08-23 Arnold D. Robbins <arnold@skeeve.com>
+
+ * README.git: Minor edits to make build steps clearer.
+
2017-08-21 Daniel Richard G. <skunk@iSKUNK.ORG>
* awk.h (c_func): Renamed to c_function to avoid conflict.
diff --git a/README.git b/README.git
index c947cc24..b590780d 100644
--- a/README.git
+++ b/README.git
@@ -1,12 +1,14 @@
-Thu Apr 17 16:54:26 IDT 2014
+Wed Aug 23 08:07:18 IDT 2017
============================
If you are reading this, you have retrieved the gawk code base via
Git from savannah.gnu.org. This is good; gawk no longer uses CVS.
-On GNU and Unix systems, please execute ./bootstrap.sh before invoking
-the usual incantaton of `./configure && make && make check'. This
-version of bootstrap.sh should work OK.
+On GNU and Unix systems, please execute use the following to build
+gawk after doing `git clone' or `git pull':
+
+ make distclean # if not a new clone
+ ./bootstrap.sh && ./configure && make && make check
On systems supported by configuration files in the pc/ subdirectory,
chdir into pc/ and run the make-config.bat script there. This will produce
diff --git a/README_d/ChangeLog b/README_d/ChangeLog
index c93879f9..43da7cdd 100644
--- a/README_d/ChangeLog
+++ b/README_d/ChangeLog
@@ -1,3 +1,7 @@
+2017-08-23 Arnold D. Robbins <arnold@skeeve.com>
+
+ * README.alpine: New file.
+
2017-08-13 Arnold D. Robbins <arnold@skeeve.com>
* README.freebsd: New file.
diff --git a/README_d/README.alpine b/README_d/README.alpine
new file mode 100644
index 00000000..4df5b450
--- /dev/null
+++ b/README_d/README.alpine
@@ -0,0 +1,15 @@
+Wed Aug 23 08:19:08 IDT 2017
+============================
+
+I have a report that Alpine Linux uses BusyBox for its utilities. In
+particular, the BusyBox ls does not have a -f option. This option is
+needed in at least one of the tests.
+
+Install coreutils on your Alpine Linux system:
+
+ apk add coreutils
+
+in order to get a fully POSIX-compliant ls.
+
+Arnold Robbins
+arnold@skeeve.com
diff --git a/pc/ChangeLog b/pc/ChangeLog
index 2e3a268d..455bd321 100644
--- a/pc/ChangeLog
+++ b/pc/ChangeLog
@@ -1,3 +1,7 @@
+2017-08-23 Arnold D. Robbins <arnold@skeeve.com>
+
+ * Makefile.am (testext): Fix spelling of testexttmp.txt.
+
2017-08-21 Eli Zaretskii <eliz@gnu.org>
* Makefile.tst (testext): Remove textexttmp.txt.
diff --git a/pc/Makefile.tst b/pc/Makefile.tst
index 8a74e31c..0bb073d0 100644
--- a/pc/Makefile.tst
+++ b/pc/Makefile.tst
@@ -1166,7 +1166,7 @@ testext::
# @$(AWK) '/^(@load|BEGIN)/,/^}/' "$(top_srcdir)"/extension/testext.c > testext.awk
@$(AWK) ' /^(@load|BEGIN)/,/^}/' "$(top_srcdir)"/extension/testext.c > testext.awk
@$(AWK) -f ./testext.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
- @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ testext.awk textexttmp.txt
+ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ testext.awk testexttmp.txt
getfile:
@echo $@
diff --git a/test/ChangeLog b/test/ChangeLog
index a015ebfe..756386af 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,4 +1,8 @@
-2017-08-21 Eli Zaretskii <eliz@gnu.org>
+2017-08-23 Arnold D. Robbins <arnold@skeeve.com>
+
+ * Makefile.am (testext): Fix spelling of testexttmp.txt.
+
+2017-08-21 Eli Zaretskii <eliz@gnu.org>
* Makefile.am (testext): Remove textexttmp.txt.
diff --git a/test/Makefile.am b/test/Makefile.am
index b2577841..99b9fade 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -2209,7 +2209,7 @@ testext::
@echo $@
@$(AWK) '/^(@load|BEGIN)/,/^}/' "$(top_srcdir)"/extension/testext.c > testext.awk
@$(AWK) -f ./testext.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
- @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ testext.awk textexttmp.txt
+ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ testext.awk testexttmp.txt
getfile:
@echo $@
diff --git a/test/Makefile.in b/test/Makefile.in
index ec3bb963..7493f439 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -2648,7 +2648,7 @@ testext::
@echo $@
@$(AWK) '/^(@load|BEGIN)/,/^}/' "$(top_srcdir)"/extension/testext.c > testext.awk
@$(AWK) -f ./testext.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
- @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ testext.awk textexttmp.txt
+ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ testext.awk testexttmp.txt
getfile:
@echo $@