FYI: 59-gary-vpath-stamp-vcl.patch

[Gary V. Vaughan]

Applied to HEAD.
--
Gary V. Vaughan      ())_.  address@hidden,gnu.org}
Research Scientist   ( '/   http://www.oranda.demon.co.uk
GNU Hacker           / )=   http://www.gnu.org/software/libtool
Technical Author   `(_~)_   http://sources.redhat.com/autobook

Index: ChangeLog
from  Gary V. Vaughan  <address@hidden>
        * Makefile.am (vcl.tmp): Be careful of VPATH builds.

Index: Makefile.am
===================================================================
RCS file: /cvsroot/libtool/libtool/Makefile.am,v
retrieving revision 1.88
diff -u -p -u -r1.88 Makefile.am
--- Makefile.am 26 Nov 2003 16:39:39 -0000 1.88
+++ Makefile.am 26 Nov 2003 18:06:03 -0000
@@ -52,13 +52,19 @@ libtoolize: $(srcdir)/libtoolize.in $(to
        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)
        address@hidden -f vcl.tmp
 
 .PHONY: configure-subdirs

pgp325WFZq6vT.pgp
Description: PGP signature