* Makefile.am (vcl.tmp): Be careful of VPATH builds.

diff --git a/ChangeLog b/ChangeLog
index 9642290b5708f7180844c95e2fdcce12152ce793..bf67d1f809ce5384df4e4647c7b9cf19c54b58ad 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2003-11-26  Gary V. Vaughan  <gary@gnu.org>
 
+       * Makefile.am (vcl.tmp): Be careful of VPATH builds.
+
        * Makefile.am (EXTRA_DIST): Add stamp-vcl, or we go back to a
        double configure run from a distributed tarball :-?
 

diff --git a/Makefile.am b/Makefile.am
index 2034fdcaf354eec3657698e192c8618f216052c4..53a74eea38c2c062861b12842092228f0b16becc 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -52,13 +52,19 @@ libtoolize: $(srcdir)/libtoolize.in $(top_builddir)/config.status
        chmod +x $@
 
 # Make sure config.status is regenerated when the version timestamp changes
+MKSTAMP = $(SHELL) $(top_srcdir)/config/mkstamp
 $(config_status): stamp-vcl
 stamp-vcl: vcl.tmp $(top_srcdir)/ChangeLog
 vcl.tmp:
-       @set `$(SHELL) config/mkstamp < $(top_srcdir)/ChangeLog`; \
-       echo "$$1" > vcl.tmp
-       @cmp -s vcl.tmp stamp-vcl \
-         || (echo "Updating stamp-vcl"; cp vcl.tmp stamp-vcl)
+       @dir=.; test -f $$dir/stamp-vcl || dir=$(srcdir); \
+       set `$(MKSTAMP) < $(top_srcdir)/ChangeLog`; \
+       echo "$$1" > vcl.tmp; \
+       cmp -s vcl.tmp $$dir/stamp-vcl \
+## If mkstamp does not match $(srcdir)/stamp-vcl, we still put the new one
+## in the current dir, incase $(srcdir) is not writable.  The dir selection
+## at the top of this rule takes care of prefering the right one on
+## subsequent runs.
+         || (echo "Updating stamp-vcl"; cp vcl.tmp ./stamp-vcl)
        -@rm -f vcl.tmp
 
 .PHONY: configure-subdirs