This fixes a bug in the libtoolize ltdl source installation rules,

which were copying Makefile.in from the libtool tree into the
package running libtoolize.  Now we explicitly list the files to
copy to force the package to generate its own Makefile.in:

* libltdl/Makefile.am (libltdl_la_SOURCES, libltdlc_la_SOURCES):
Add ltdl.h.
(ltdldatadir): New variable for installation directory of
libtoolize --ltdl files.
(ltdldata_DATA): Tell automake what files to copy there at install
time (and remove at unistall time!).
(local-install-files): Removed.  This hack is not required
anymore, the automake generated install rules are much more
advanced than this.
* Makefile.am (install-data-hook, uninstall-local): Removed.
Libltdl files for libtoolize are installed by their own Makefile
now.

diff --git a/ChangeLog b/ChangeLog
index cf8a583c5c22f96e0c22a539bbf5771cb22c10d6..9d6e615d70a36253b4db4adb56b5f4631b1ba167 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2004-01-22  Gary V. Vaughan  <gary@gnu.org>
+
+       This fixes a bug in the libtoolize ltdl source installation rules,
+       which were copying Makefile.in from the libtool tree into the
+       package running libtoolize.  Now we explicitly list the files to
+       copy to force the package to generate its own Makefile.in:
+
+       * libltdl/Makefile.am (libltdl_la_SOURCES, libltdlc_la_SOURCES):
+       Add ltdl.h.
+       (ltdldatadir): New variable for installation directory of
+       libtoolize --ltdl files.
+       (ltdldata_DATA): Tell automake what files to copy there at install
+       time (and remove at unistall time!).
+       (local-install-files): Removed.  This hack is not required
+       anymore, the automake generated install rules are much more
+       advanced than this.
+       * Makefile.am (install-data-hook, uninstall-local): Removed.
+       Libltdl files for libtoolize are installed by their own Makefile
+       now.
+
 2004-01-22  Jeff Squyres  <jsquyres@lam-mpi.org>
 
        * m4/libtool.m4 (AC_LIBTOOL_PROG_CC_C_O): Some compilers

diff --git a/Makefile.am b/Makefile.am
index 2aab205d8d9509b50a8eb61f789300d1f399b2b1..595571648086bd5ba7a6565dac7343b2fbc90aef 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -81,14 +81,6 @@ install-data-local:
        -rm -rf $(DESTDIR)$(aclocaldir)/ltdl.m4
        -rm -rf $(DESTDIR)$(aclocaldir)/libtool.m4
 
-# Create and install libltdl
-install-data-hook:
-       cd libltdl && $(MAKE) local-install-files
-
-# Uninstall libltdl
-uninstall-local:
-       -rm -rf $(DESTDIR)$(pkgdatadir)/libltdl
-
 
 ## ---------------------------------------------------------------- ##
 ##  Everything past here is useful to the maintainer, but probably  ##

diff --git a/libltdl/Makefile.am b/libltdl/Makefile.am
index f9116dabaeec61a746c89b180581cce4ff49dcbe..fa4ef7ae7ff63ca9c7e1dd7341c75bbdf9a0574a 100644 (file)
--- a/libltdl/Makefile.am
+++ b/libltdl/Makefile.am
@@ -1,4 +1,21 @@
 ## Process this file with automake to produce Makefile.in
+##
+## Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004 Free Software Foundation
+##
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## 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
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; see the file COPYING.  If not, write to
+## the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+## Boston, MA 02111-1307, USA.
 
 AUTOMAKE_OPTIONS = no-dependencies foreign
 ACLOCAL_AMFLAGS  = -I ../m4
@@ -20,28 +37,18 @@ endif
 ## default.
 CLEANFILES = libltdl.la libltdlc.la
 
-libltdl_la_SOURCES = ltdl.c
+libltdl_la_SOURCES = ltdl.c ltdl.h
 libltdl_la_LDFLAGS = -no-undefined -version-info 4:0:1
 libltdl_la_LIBADD = $(LIBADD_DL)
 
-libltdlc_la_SOURCES = ltdl.c
+libltdlc_la_SOURCES = ltdl.c ltdl.h
 libltdlc_la_LIBADD = $(LIBADD_DL)
 
 ## Because we do not have automatic dependency tracking:
 ltdl.lo: ltdl.h $(top_srcdir)/$(CONFIG_H)
 
-## This allows us to install libltdl without using ln and without creating
-## a world writeable directory.
-## FIXME:  Remove this rule once automake can do this properly by itself.
-local-install-files: $(DISTFILES)
-       -rm -rf $(DESTDIR)$(datadir)/libtool/libltdl
-       $(mkinstalldirs) $(DESTDIR)$(datadir)/libtool/libltdl
-       @for file in $(DISTFILES); do \
-         d=$(srcdir); \
-         if test -d $$d/$$file; then \
-           cp -r $$d/$$file $(DESTDIR)$(datadir)/libtool/libltdl/$$file; \
-         else \
-           test -f $(DESTDIR)$(datadir)/libtool/libltdl/$$file \
-           || cp $$d/$$file $(DESTDIR)$(datadir)/libtool/libltdl/$$file || :; \
-         fi; \
-       done
+
+## These are installed as a subdirectory of pkgdatadir so that
+## libtoolize --ltdl can find them later:
+ltdldatadir = $(pkgdatadir)/libltdl
+ltdldata_DATA = COPYING.LIB Makefile.am README $(libltdl_la_SOURCES)