* Makefile.am (pkgmacro_DATA): We have to distribute

m4/ltversion.m4 because it can be needed before the Makefile
that generates it exists.

diff --git a/ChangeLog b/ChangeLog
index 3fc5664d9de797351a1c1486855ac09792734f17..066187ffc9005381b0d27c19eb7c3f693e8c2e29 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-02-13  Scott James Remnant  <scott@netsplit.com>
+
+       * Makefile.am (pkgmacro_DATA): We have to distribute
+       m4/ltversion.m4 because it can be needed before the Makefile
+       that generates it exists.
+
 2004-02-13  Gary V. Vaughan  <gary@gnu.org>
 
        * commit (MKSTAMP): Look for mkstamp in the right place.

diff --git a/Makefile.am b/Makefile.am
index ac0845620cab7030eb68c9838a27328fb738a997..579917b90149f419996a73c0534e0f6ca6453878 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,12 +33,10 @@ CLEANFILES = libtool libtoolize ltmain.shT
 # executable by hand
 dist_pkgdata_DATA = config/config.guess config/config.sub config/ltmain.sh
 
-# We maintain our own macros to provent problems with ancient definitions.
-# lt~obsolete.m4 doesn't belong here, it's for bootstrapping us only
+# Everything that gets picked up by aclocal is automatically distributed,
+# this is the list of macro files we install on the user's system.
 pkgmacrodir = $(pkgdatadir)/m4
-dist_pkgmacro_DATA = m4/libtool.m4 m4/ltdl.m4 m4/ltsugar.m4
-nodist_pkgmacro_DATA = m4/ltversion.m4
-EXTRA_DIST += m4/ltversion.in
+pkgmacro_DATA = m4/libtool.m4 m4/ltdl.m4 m4/ltsugar.m4 m4/ltversion.m4
 
 # We build ltversion.m4 here, instead of from config.status,
 # because config.status is rerun each time one og configure's
@@ -47,6 +45,7 @@ EXTRA_DIST += m4/ltversion.in
 # 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
 $(top_srcdir)/m4/ltversion.m4: $(top_srcdir)/m4/ltversion.in stamp-vcl
        set `$(MKSTAMP) < $(top_srcdir)/ChangeLog`; \
        sed -e "s,[@]MACRO_VERSION[@],$(VERSION),g" \