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

m4/ltversion.m4 because it can be needed before the Makefile
that generates it exists.
This commit is contained in:
Scott James Remnant 2004-02-13 00:40:37 +00:00
parent 82d59110c5
commit 2e3dde20ea
2 changed files with 10 additions and 5 deletions

View File

@ -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> 2004-02-13 Gary V. Vaughan <gary@gnu.org>
* commit (MKSTAMP): Look for mkstamp in the right place. * commit (MKSTAMP): Look for mkstamp in the right place.

View File

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