From 77749332155b2e583f295bb52994bb6b4b45348e Mon Sep 17 00:00:00 2001
From: "Gary V. Vaughan" <gary@gnu.org>
Date: Wed, 26 Nov 2003 18:06:52 +0000
Subject: [PATCH] * Makefile.am (vcl.tmp): Be careful of VPATH builds.

---
 ChangeLog   |  2 ++
 Makefile.am | 14 ++++++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9642290b5..bf67d1f80 100644
--- 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 2034fdcaf..53a74eea3 100644
--- 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
-- 
2.47.2