* bootstrap: Remove vcl.tmp, otherwise it can interfere with make.

* Makefile.am (vcl.tmp): Move comment out of multi-line command,
as this rule is called from bootstrap as if it were a Makefile.

diff --git a/ChangeLog b/ChangeLog
index 854499ae1d3b32039b47108dc8e586147fe898e1..e0175211e9da2fb4be2dd156ef6e0446a7255ac6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2004-02-06  Gary V. Vaughan  <gary@gnu.org>
 
+       * bootstrap: Remove vcl.tmp, otherwise it can interfere with make.
+       * Makefile.am (vcl.tmp): Move comment out of multi-line command,
+       as this rule is called from bootstrap as if it were a Makefile.
+
        * m4/ltversion.in: New file to capture what version number macros
        are being used.
        * Makefile.am (m4/ltversion.m4): New rule to create it from

diff --git a/Makefile.am b/Makefile.am
index 067aab2ebba9ee5fd784ae6c007073e0749814ca..27c5b517f8154750c368ee261f66b272c5cadf4a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -59,6 +59,10 @@ $(top_srcdir)/m4/ltversion.m4: $(top_srcdir)/m4/ltversion.in stamp-vcl
 # The standalone libtool script, and the libtool distributor.
 bin_SCRIPTS = libtool libtoolize
 
+## 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.
 MKSTAMP = $(SHELL) $(top_srcdir)/config/mkstamp
 stamp-vcl: vcl.tmp $(top_srcdir)/ChangeLog
 vcl.tmp:
@@ -66,10 +70,6 @@ vcl.tmp:
        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
 

diff --git a/bootstrap b/bootstrap
index 07c3e5bd14e6e6db8a9f78745692c5638c502d58..e1495e9e9dd06f1db58707fec731f58eccbed286 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -67,6 +67,6 @@ for file in $fakes; do
 done
 
 # These files con cause an infinite configure loop if left behind.
-rm -f Makefile libltdl/Makefile libtool
+rm -f Makefile libltdl/Makefile libtool vcl.tmp
 
 exit 0