libtool-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH-1.5] use automake to install libltdl


From: Peter O'Gorman
Subject: [PATCH-1.5] use automake to install libltdl
Date: Thu, 08 Apr 2004 00:11:01 +0900
User-agent: Mozilla/5.0 (Macintosh; U; PPC Mac OS X Mach-O; en-US; rv:1.6b) Gecko/20031205 Thunderbird/0.4

Hi,
I'm hardly a makefile whiz, but this seems to do the right thing. Please fix the errors for me :)

Peter
--
Peter O'Gorman - http://www.pogma.com

Index: ChangeLog
2004-04-07  Peter O'Gorman  <address@hidden>

        * Makefile.am, libltdl/Makefile.am: Use automake to install
        $datadir/libtool/libltdl/*

Index: Makefile.am
===================================================================
RCS file: /cvsroot/libtool/libtool/Makefile.am,v
retrieving revision 1.69.2.9
diff -u -3 -p -u -r1.69.2.9 Makefile.am
--- Makefile.am 4 Apr 2004 14:12:23 -0000 1.69.2.9
+++ Makefile.am 7 Apr 2004 15:08:58 -0000
@@ -72,7 +72,6 @@ configure-subdirs distdir: $(DIST_MAKEFI
 
 # Create and install libltdl
 install-data-hook:
-       cd libltdl && $(MAKE) local-install-files
        chmod +x $(DESTDIR)$(pkgdatadir)/config.guess
        chmod +x $(DESTDIR)$(pkgdatadir)/config.sub
 
Index: libltdl/Makefile.am
===================================================================
RCS file: /cvsroot/libtool/libtool/libltdl/Makefile.am,v
retrieving revision 1.42
diff -u -3 -p -u -r1.42 Makefile.am
--- libltdl/Makefile.am 11 Sep 2001 01:26:44 -0000 1.42
+++ libltdl/Makefile.am 7 Apr 2004 15:08:58 -0000
@@ -31,18 +31,8 @@ $(libltdl_la_OBJECTS) $(libltdlc_la_OBJE
 libtool: $(LIBTOOL_DEPS)
        $(SHELL) ./config.status --recheck
 
-## 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 = $(datadir)/libtool/libltdl
+ltdldata_DATA = $(DIST_COMMON) $(libltdl_la_SOURCES)
+

reply via email to

[Prev in Thread] Current Thread [Next in Thread]