76-gary-dont-install-libltdl-Makefile-in.patch

[Gary V. Vaughan]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Okay to apply?
- --
Gary V. Vaughan      ())_.  address@hidden,gnu.org}
Research Scientist   ( '/   http://www.oranda.demon.co.uk
GNU Hacker           / )=   http://www.gnu.org/software/libtool
Technical Author   `(_~)_   http://sources.redhat.com/autobook
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.2 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFAEA1yFRMICSmD1gYRAmicAJ4n+kqS4lj36xKQHNQqg4T07ALl4wCgm4LE
36YtZvKQNTPGE9TnBsUTn2I=
=Kg+S
-----END PGP SIGNATURE-----

X-UIDL: J2S"!W9V!!^9-"!PC9"!
X-Mozilla-Status: 0001
X-Mozilla-Status2: 00000000
Return-Path: <address@hidden>
Delivered-To: address@hidden
Received: (qmail 29237 invoked from network); 22 Jan 2004 17:47:16 -0000
Received: from unknown (HELO mail.eris.qinetiq.com) (128.98.1.1)
  by mailhost.eris.qinetiq.com with SMTP; 22 Jan 2004 17:47:16 -0000
Received: (qmail 24060 invoked from network); 22 Jan 2004 18:01:42 -0000
Received: from mail3.bulldogcommunications.com (HELO ns1.bulldogdsl.com) 
(212.158.192.11)
  by ns0.eris.qinetiq.com with SMTP; 22 Jan 2004 18:01:42 -0000
Received: from lilith.local (unknown [212.158.244.14])
        by ns1.bulldogdsl.com (Postfix) with ESMTP id B5751FC66
        for <address@hidden>; Thu, 22 Jan 2004 17:46:23 +0000 (GMT)
Received: (from address@hidden)
        by lilith.local (8.12.9/8.12.9) id i0MHlmCa019090
        for address@hidden; Thu, 22 Jan 2004 17:47:48 GMT
Date: Thu, 22 Jan 2004 17:47:48 GMT
From: "Gary V. Vaughan" <address@hidden>
Message-Id: <address@hidden>
To: address@hidden
X-UIDL: J2S"!W9V!!^9-"!PC9"!

Index: ChangeLog
from  Gary V. Vaughan  <address@hidden>
        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  Gary V. Vaughan  <address@hidden>

Index: Makefile.am
===================================================================
RCS file: /cvsroot/libtool/libtool/Makefile.am,v
retrieving revision 1.94
diff -u -p -u -r1.94 Makefile.am
--- Makefile.am 15 Jan 2004 19:16:51 -0000 1.94
+++ Makefile.am 22 Jan 2004 17:45:19 -0000
@@ -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  ##
Index: libltdl/Makefile.am
===================================================================
RCS file: /cvsroot/libtool/libtool/libltdl/Makefile.am,v
retrieving revision 1.45
diff -u -p -u -r1.45 Makefile.am
--- libltdl/Makefile.am 16 Jan 2004 22:03:19 -0000 1.45
+++ libltdl/Makefile.am 22 Jan 2004 17:45:19 -0000
@@ -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)