* Makefile.am ($(top_srcdir)/m4/ltversion.m4): Since we already did

`cd $(top_srcdir)' for this rule, we can't mv ltversion.tmp to the
relative $(top_srcdir) again!  Also, run $(MKSTAMP) before changing
directories, or it won't be found.
($(top_srcdir)/config/ltmain.sh): Ditto.
(EXTRA_DIST): We should distribute ltversion.m4 too.

diff --git a/ChangeLog b/ChangeLog
index 07ddab787bd5c569a3e93fd6df2ff76d296f5022..ca978aad0d3e04ae901876c022912d831019938c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2004-08-05  Gary V. Vaughan  <gary@gnu.org>
+
+       * Makefile.am ($(top_srcdir)/m4/ltversion.m4): Since we already did
+       `cd $(top_srcdir)' for this rule, we can't mv ltversion.tmp to the
+       relative $(top_srcdir) again!  Also, run $(MKSTAMP) before changing
+       directories, or it won't be found.
+       ($(top_srcdir)/config/ltmain.sh): Ditto.
+       (EXTRA_DIST): We should distribute ltversion.m4 too.
+
 2004-08-04  Peter O'Gorman  <peter@pogma.com>
 
        * m4/libtool.m4 (AC_LIBTOOL_SYS_MAX_CMD_LEN): Since CONFIG_SHELL may

diff --git a/Makefile.am b/Makefile.am
index c6ef6c405ad076e55a61d47e4abf3f50d0765b1c..8f7120d33125db16067fa0c565ff823a1c7c1e38 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -74,18 +74,18 @@ vcl-tmp:
 # a loop otherwise.
 # Use `$(top_srcdir)/m4' for the benefit of non-GNU makes: this is
 # how ltversion.m4 appears in our dependencies.
-EXTRA_DIST += m4/ltversion.in
+EXTRA_DIST += m4/ltversion.in m4/ltversion.m4
 $(top_srcdir)/m4/ltversion.m4: m4/ltversion.in configure.ac stamp-vcl
+       set -- `$(MKSTAMP) < $(top_srcdir)/ChangeLog`; \
        cd $(top_srcdir); \
        rm -f m4/ltversion.tmp; \
-       set -- `$(MKSTAMP) < ChangeLog`; \
        serial=`echo $$1 | sed 's,^1[.],,g'`; \
        input="ltversion.in"; \
        $(edit) -e "s,@MACRO_REVISION\@,$$1,g" \
                -e "s,@MACRO_SERIAL\@,$$serial,g" \
                m4/ltversion.in > m4/ltversion.tmp; \
        chmod a-w m4/ltversion.tmp; \
-       mv -f m4/ltversion.tmp $(top_srcdir)/m4/ltversion.m4
+       mv -f m4/ltversion.tmp m4/ltversion.m4
 
 ## And for similar reasons, ltmain.sh can't be built from config.status.
 EXTRA_DIST += config/ltmain.sh
@@ -98,7 +98,7 @@ $(top_srcdir)/config/ltmain.sh: config/ltmain.in configure.ac stamp-vcl
                -e "s,@package_revision\@,$$1,g" \
                config/ltmain.in > config/ltmain.tmp; \
        chmod a-w config/ltmain.tmp; \
-       mv -f config/ltmain.tmp $(top_srcdir)/config/ltmain.sh
+       mv -f config/ltmain.tmp config/ltmain.sh
 
 # The libtool distributor and the standalone libtool script.
 bin_SCRIPTS = libtoolize libtool