summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArnold D. Robbins <arnold@skeeve.com>2014-01-31 12:10:50 +0200
committerArnold D. Robbins <arnold@skeeve.com>2014-01-31 12:10:50 +0200
commit8e1bb1e107849bba12e163026e5ac1bc9ddd7ec9 (patch)
tree1557a3d89212bf8b6c909f1fad999813aa5851b9
parentc712957772b810b017088e7b052fa06495c44471 (diff)
downloadgawk-8e1bb1e107849bba12e163026e5ac1bc9ddd7ec9.tar.gz
More changes to dist-hook.
-rw-r--r--ChangeLog6
-rw-r--r--Makefile.am5
-rw-r--r--Makefile.in5
3 files changed, 14 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 9b92bd2e..2a6d1df7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 3ca45b2b..fe921ad8 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