Merge branch 'gawk-4.1-stable'

7 files changed, 28 insertions, 14 deletions

diff --git a/.gitignore b/.gitignore
index 71be0874..899a16c0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,8 @@
 # Directories
 autom4te.cache
 .deps
+grcat.dSYM
+pwcat.dSYM
 
 # Single files.
 Makefile
diff --git a/ChangeLog b/ChangeLog
index d9942268..1abb3e5e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-03-17         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* .gitignore: Add .dSYM directories for Mac OS X.
+	Thanks to Hermann Peifer for the suggestion.
+
 2014-03-10         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* dfa.h, dfa.c: Sync with grep. Yet again.
diff --git a/NEWS b/NEWS
index cf741b18..1e43c6fc 100644
--- a/NEWS
+++ b/NEWS
@@ -20,7 +20,7 @@ Changes from 4.1.0 to 4.1.1
 ---------------------------
 
 1. The "stat" extension now includes a "devbsize" element which indicates
-   the units for the "nblocks" element
+   the units for the "nblocks" element.
 
 2. The extension facility now works on MinGW. Many of the extensions can be
    built and used directly.
@@ -41,23 +41,23 @@ Changes from 4.1.0 to 4.1.1
    libtool 2.4.2.418.
 
 10. The configure script now accepts a --disable-extensions option,
-which disables checking for and building the extensions.
+    which disables checking for and building the extensions.
 
 11. The VMS port has been considerably improved. In particular config.h
-is now generated by a DCL script. Also, the extension facility works
-and several of the extensions can be built and used. Currently, the
-extension facility only works on Alpha and Itanium.
+    is now generated by a DCL script. Also, the extension facility works
+    and several of the extensions can be built and used. Currently, the
+    extension facility only works on Alpha and Itanium.
 
 12. The API now provides functions pointers for malloc(), calloc(),
-realloc() and free(), to insure that the same memory allocation
-functions are always used. This bumps the minor version by one.
+    realloc() and free(), to insure that the same memory allocation
+    functions are always used. This bumps the minor version by one.
 
 13. The printf quote flag now works correctly in locales with a different
-decimal point character but without a thousands separator character.
-If the thousands separator is a string, it will be correctly added
-to decimal numbers.
+    decimal point character but without a thousands separator character.
+    If the thousands separator is a string, it will be correctly added
+    to decimal numbers.
 
-XXX. A number of bugs have been fixed. See the ChangeLog.
+14. A number of bugs have been fixed. See the ChangeLog.
 
 Changes from 4.0.2 to 4.1.0
 ---------------------------
diff --git a/awklib/ChangeLog b/awklib/ChangeLog
index e47d37b2..e0baf3cb 100644
--- a/awklib/ChangeLog
+++ b/awklib/ChangeLog
@@ -1,3 +1,8 @@
+2014-03-17         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* Makefile.am (clean-local): Clean up .dSYM directories for Mac OS X.
+	Thanks to Hermann Piefer for the suggestion.
+
 2013-05-09         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* 4.1.0: Release tar ball made.
diff --git a/awklib/Makefile.am b/awklib/Makefile.am
index b10fa644..6ffbea81 100644
--- a/awklib/Makefile.am
+++ b/awklib/Makefile.am
@@ -62,6 +62,7 @@ uninstall-local:
 clean-local:
 	rm -f $(AUXAWK) igawk *.exe
 	rm -fr eg.old
+	rm -fr grcat.dSYM pwcat.dSYM
 
 $(srcdir)/stamp-eg: $(srcdir)/../doc/gawk.texi $(srcdir)/../doc/gawkinet.texi
 	cd $(srcdir) && \
diff --git a/awklib/Makefile.in b/awklib/Makefile.in
index 15e6c24d..d32ae04a 100644
--- a/awklib/Makefile.in
+++ b/awklib/Makefile.in
@@ -715,6 +715,7 @@ uninstall-local:
 clean-local:
 	rm -f $(AUXAWK) igawk *.exe
 	rm -fr eg.old
+	rm -fr grcat.dSYM pwcat.dSYM
 
 $(srcdir)/stamp-eg: $(srcdir)/../doc/gawk.texi $(srcdir)/../doc/gawkinet.texi
 	cd $(srcdir) && \
diff --git a/pc/config.h b/pc/config.h
index 1d9be09b..c5d78a96 100644
--- a/pc/config.h
+++ b/pc/config.h
@@ -423,7 +423,7 @@
 #define PACKAGE_NAME "GNU Awk"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "GNU Awk 4.1.0e"
+#define PACKAGE_STRING "GNU Awk 4.1.60"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "gawk"
@@ -432,7 +432,7 @@
 #define PACKAGE_URL "http://www.gnu.org/software/gawk/"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "4.1.0e"
+#define PACKAGE_VERSION "4.1.60"
 
 /* Define to 1 if *printf supports %F format */
 #undef PRINTF_HAS_F_FORMAT
@@ -494,7 +494,7 @@
 
 
 /* Version number of package */
-#define VERSION "4.1.0e"
+#define VERSION "4.1.60"
 
 /* Enable large inode numbers on Mac OS X 10.5.  */
 #ifndef _DARWIN_USE_64_BIT_INODE