* Makefile.am ($(top_srcdir)/config/ltmain.sh): Automake assumes,

quite rightly for every project except libtool, that there will be
an ltmain.sh in the source tree.
(EXTRA_DIST): As do the dist rules it generates.
(dist-hook): Even though we definitely don't want to distribute
our local ltmain.sh.

diff --git a/ChangeLog b/ChangeLog
index 829b3f252e5d02d44c5cfcadc3e0f95ea80cfa12..93bf5f356aa398f43fdded5e24b6ebf495ef3f38 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2004-07-29  Gary V. Vaughan  <gary@gnu.org>
 
+       * Makefile.am ($(top_srcdir)/config/ltmain.sh): Automake assumes,
+       quite rightly for every project except libtool, that there will be
+       an ltmain.sh in the source tree.
+       (EXTRA_DIST): As do the dist rules it generates.
+       (dist-hook): Even though we definitely don't want to distribute
+       our local ltmain.sh.
+
        * config/config.guess, config/config.sub: Don't check these in,
        they cause spurious conflicts on cvs commit and update, and are
        added by bootstrap in any case.

diff --git a/Makefile.am b/Makefile.am
index a6c3df39909a3dbb2ef9e9c1fa72ca692abef0bb..53b892699b570222424386a4c6489b298f2a6dee 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -90,3 +90,20 @@ install-data-local:
 install-data-hook:
        chmod +x $(DESTDIR)$(pkgdatadir)/config.guess
        chmod +x $(DESTDIR)$(pkgdatadir)/config.sub
+
+## Unlike any other project, libtool builds its own ltmain.sh, so
+## some of the rules generated by automake need to be frobbed in
+## VPATH builds because ltmain.sh ends up in the build tree rather
+## than the source tree:
+$(top_srcdir)/config/ltmain.sh: config/ltmain.sh
+       cp config/ltmain.sh $(top_srcdir)/config/ltmain.sh
+
+## Put it in so that automake doesn't choke on reconf.  We don't
+## really want to distribute this file, but putting it here gives
+## the automake dist rules something to see during `make distcheck':
+EXTRA_DIST += $(top_srcdir)/config/ltmain.sh
+
+## Take it away again so that we don't distribute it by mistake
+## (it is supposed to be generated on the installers machine).
+dist-hook: $(top_srcdir)/config/ltmain.sh
+       -rm -f $(top_distdir)/config/ltmain.sh