diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2014-01-31 12:21:17 +0200 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2014-01-31 12:21:17 +0200 |
| commit | d68ff70e48e7d695231b07f6a55a5d98a77ac4b4 (patch) | |
| tree | 31a37a1ede9becb7eaafa3a41aed06082be5b062 | |
| parent | 27c02ee1fc9b76fb39726f37481823982230ee73 (diff) | |
| parent | 4cb70d5caf61fcb63b2b4b8995e063aa96238dae (diff) | |
| download | egawk-d68ff70e48e7d695231b07f6a55a5d98a77ac4b4.tar.gz egawk-d68ff70e48e7d695231b07f6a55a5d98a77ac4b4.tar.bz2 egawk-d68ff70e48e7d695231b07f6a55a5d98a77ac4b4.zip | |
Merge branch 'gawk-4.1-stable'
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Makefile.am | 5 | ||||
| -rw-r--r-- | Makefile.in | 5 | ||||
| -rw-r--r-- | pc/config.h | 6 |
4 files changed, 17 insertions, 5 deletions
@@ -1,3 +1,9 @@ +2014-01-31 Arnold D. Robbins <arnold@skeeve.com> + + * Makefile.am (dist-hook): Improve creation of pc/config.h. We + have to jump through a lot of hoops for 'make distcheck' to + actually work. + 2014-01-30 Arnold D. Robbins <arnold@skeeve.com> * Makefile.am (dist-hook): Improve creation of pc/config.h to copy diff --git a/Makefile.am b/Makefile.am index ee70378a..a8acdc48 100644 --- a/Makefile.am +++ b/Makefile.am @@ -172,11 +172,14 @@ check-local: gawk$(EXEEXT) dist-hook: cd $(distdir)/extension ; rm -f *.o *.so cd $(srcdir)/pc ; \ + chmod u+w config.h ; \ sed -n -f configpk.sed < ../configure.ac > /tmp/tmp.sed ; \ sed -f config.sed < ../configh.in > /tmp/config.tmp ; \ sed -f /tmp/tmp.sed < /tmp/config.tmp > config.h ; \ $(RM) /tmp/tmp.sed /tmp/config.tmp - cp pc/config.h $(distdir)/pc/config.h + pwd + chmod u+w $(distdir)/pc/config.h + cp $(srcdir)/pc/config.h $(distdir)/pc/config.h # Special rules for individual files # Use of awk instead of $(AWK) is deliberate, in case gawk doesn't build diff --git a/Makefile.in b/Makefile.in index 65efdf34..4fed13ff 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1171,11 +1171,14 @@ check-local: gawk$(EXEEXT) dist-hook: cd $(distdir)/extension ; rm -f *.o *.so cd $(srcdir)/pc ; \ + chmod u+w config.h ; \ sed -n -f configpk.sed < ../configure.ac > /tmp/tmp.sed ; \ sed -f config.sed < ../configh.in > /tmp/config.tmp ; \ sed -f /tmp/tmp.sed < /tmp/config.tmp > config.h ; \ $(RM) /tmp/tmp.sed /tmp/config.tmp - cp pc/config.h $(distdir)/pc/config.h + pwd + chmod u+w $(distdir)/pc/config.h + cp $(srcdir)/pc/config.h $(distdir)/pc/config.h # Special rules for individual files # Use of awk instead of $(AWK) is deliberate, in case gawk doesn't build diff --git a/pc/config.h b/pc/config.h index cd489877..d7f9ba91 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.0c" +#define PACKAGE_STRING "GNU Awk 4.1.0d" /* 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.0c" +#define PACKAGE_VERSION "4.1.0d" /* 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.0c" +#define VERSION "4.1.0d" /* Enable large inode numbers on Mac OS X 10.5. */ #ifndef _DARWIN_USE_64_BIT_INODE |