aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--config/setup-dep.mk8
2 files changed, 12 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 9e2a2c5c..fdf2db58 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-09-04 Gabriel Dos Reis <gdr@cs.tamu.edu>
+
+ * config/setup-dep.mk ($(top_srcdir)/configure.ac): Robustify
+ regeneration from pamphlet.
+ ($(srcdir)/Makefile.in): Likewise.
+
2007-09-03 Gabriel Dos Reis <gdr@cs.tamu.edu>
* configure.ac.pamphlet: Disable HyperDoc if X11 is not available.
diff --git a/config/setup-dep.mk b/config/setup-dep.mk
index b66e9e81..3ef4d1e9 100644
--- a/config/setup-dep.mk
+++ b/config/setup-dep.mk
@@ -111,7 +111,8 @@ $(axiom_build_texdir)/axiom.sty: $(axiom_src_docdir)/axiom.sty.pamphlet
## pamphlet files.
$(top_srcdir)/configure.ac: $(top_srcdir)/configure.ac.pamphlet
cd $(top_srcdir) && \
- notangle ./configure.ac.pamphlet > configure.ac
+ notangle ./configure.ac.pamphlet > configure.ac-tmp && \
+ config/move-if-change configure.ac-tmp configure.ac
$(top_srcdir)/configure: $(top_srcdir)/configure.ac \
$(top_srcdir)/config/axiom.m4
@@ -120,7 +121,10 @@ $(top_srcdir)/configure: $(top_srcdir)/configure.ac \
## Rules for regenerating Makefile.in from pamphlets.
$(srcdir)/Makefile.in: $(srcdir)/Makefile.pamphlet
- cd $(srcdir) && notangle -t8 Makefile.pamphlet > ./Makefile.in
+ notangle -t8 $(srcdir)/Makefile.pamphlet > \
+ $(srcdir)/Makefile.in-tmp && \
+ $(top_srcdir)/config/move-if-change $(srcdir)/Makefile.in-tmp \
+ $(srcdir)/Makefile.in
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_srcdir)/config/var-def.mk \