* Makefile.am: config/ltmain.sh is generated by config/ltmain.m4sh.

diff --git a/ChangeLog b/ChangeLog
index 1fc97a738aae2dbd7880341930aeba763a7bd532..753e2c5f453a7ec4b5161d4a407781ba2000495a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-10  James E Wilson <wilson@specifixinc.com>,
+           Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+
+       * Makefile.am: config/ltmain.sh is generated by config/ltmain.m4sh.
+
 2004-11-09  Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
 
        * doc/libtool.texi (Compile mode, Link mode,

diff --git a/Makefile.am b/Makefile.am
index 9652d0b6af93f7f1b27f1409ad9806d24eb96347..fa480c49da772b6eba6603021319e07c71898843 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,6 +7,11 @@
 ## the Free Software Foundation; either version 2 of the License, or
 ## (at your option) any later version.
 ##
+## As a special exception to the GNU Lesser General Public License,
+## if you distribute this file as part of a program or library that
+## is built using GNU libtool, you may include it under the same
+## distribution terms that you use for the rest of that program.
+##
 ## This program is distributed in the hope that it will be useful,
 ## but WITHOUT ANY WARRANTY; without even the implied warranty of
 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -126,7 +131,7 @@ $(top_srcdir)/config/ltmain.sh: $(sh_files) config/ltmain.m4sh configure.ac \
        cd $(top_srcdir); \
        rm -f config/ltmain.in config/ltmain.tmp config/ltmain.sh; \
        $(M4SH) -B ./config config/ltmain.m4sh > config/ltmain.in; \
-       input="ltmain.in"; \
+       input="ltmain.m4sh"; \
        $(edit) -e "s,@TIMESTAMP\@,$$TIMESTAMP,g" \
                -e "s,@package_revision\@,$$1,g" \
                config/ltmain.in > config/ltmain.tmp; \