summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArnold D. Robbins <arnold@skeeve.com>2014-01-30 21:47:07 +0200
committerArnold D. Robbins <arnold@skeeve.com>2014-01-30 21:47:07 +0200
commitd326a1b2bdba07f2c54d53a2d16d46db96be40a9 (patch)
treeca5fa70e87111c82997386be0c199026fea9ec7b
parentf7f823dfd01a6f9778d4f41d7484f2175b80b1c5 (diff)
downloadgawk-d326a1b2bdba07f2c54d53a2d16d46db96be40a9.tar.gz
Fix creation of pc/config.h.
-rw-r--r--ChangeLog6
-rw-r--r--Makefile.am9
-rw-r--r--Makefile.in9
3 files changed, 16 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index ee5fae95..9b92bd2e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-01-30 Arnold D. Robbins <arnold@skeeve.com>
+
+ * Makefile.am (dist-hook): Improve creation of pc/config.h to copy
+ the new file into the distribution directory being created.
+ Also, put the temporary files into /tmp.
+
2014-01-28 Arnold D. Robbins <arnold@skeeve.com>
* awkgram.y (negate_num): If just a double, return. Fixes a bug
diff --git a/Makefile.am b/Makefile.am
index efb3711f..ee70378a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -172,10 +172,11 @@ check-local: gawk$(EXEEXT)
dist-hook:
cd $(distdir)/extension ; rm -f *.o *.so
cd $(srcdir)/pc ; \
- sed -n -f configpk.sed < ../configure.ac > tmp.sed ; \
- sed -f config.sed < ../configh.in > config.tmp ; \
- sed -f tmp.sed < config.tmp > config.h ; \
- $(RM) tmp.sed config.tmp
+ 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
# 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 e87baa6a..3ca45b2b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1171,10 +1171,11 @@ check-local: gawk$(EXEEXT)
dist-hook:
cd $(distdir)/extension ; rm -f *.o *.so
cd $(srcdir)/pc ; \
- sed -n -f configpk.sed < ../configure.ac > tmp.sed ; \
- sed -f config.sed < ../configh.in > config.tmp ; \
- sed -f tmp.sed < config.tmp > config.h ; \
- $(RM) tmp.sed config.tmp
+ 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
# Special rules for individual files
# Use of awk instead of $(AWK) is deliberate, in case gawk doesn't build