* Makefile.am (EXTRA_DIST): Don't distribute instutils.

(install-data-hook): use libltdl/Makefile.am's local-install files
rule.
* libltdl/Makefile.am (local-install-files):  New rule to install
libltdl without creating links or mode 777 directories.
* instutil/*: deleted.

diff --git a/ChangeLog b/ChangeLog
index 5b31650776ecc99f8ef886cd1473df88bc38d489..bd904bf674dd65255da47d0d90ca81379fd6a762 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+1999-05-21  Pavel Roskin  <pavel_roskin@geocities.com> 
+
+       * Makefile.am (EXTRA_DIST): Don't distribute instutils.
+       (install-data-hook): use libltdl/Makefile.am's local-install files
+       rule.
+       * libltdl/Makefile.am (local-install-files):  New rule to install
+       libltdl without creating links or mode 777 directories.
+       * instutil/*: deleted.
+
 1999-05-21  Alexandre Oliva  <oliva@dcc.unicamp.br>
 
        * doc/PLATFORMS: Updated to 1.3.1 for all platforms I've got.

diff --git a/Makefile.am b/Makefile.am
index 7af058efa9da4e31807a6eaf4ae9cd999ce93337..f255f9f06ddfec40aa481c57acfd823dc2a351b6 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,7 +15,7 @@ LIBS= @LIBS@
 aclocal_macros = libtool.m4
 
 EXTRA_DIST = $(aclocal_macros) libtoolize.in ltconfig.in ltmain.in \
-       mkstamp ChangeLog.0 instutil/chmod instutil/ln
+       mkstamp ChangeLog.0
 CLEANFILES = libtool libtoolize ltconfig.T ltmain.shT
 
 # These are required by libtoolize.
@@ -101,8 +101,7 @@ configure-subdirs distdir: $(DIST_MAKEFILE_LIST)
 
 # Create and install libltdl
 install-data-hook:
-       PATH=`cd $(srcdir)/instutil && pwd`":$$PATH" && \
-       cd libltdl && $(MAKE) distdir distdir=$(DESTDIR)$(pkgdatadir)/libltdl
+       cd libltdl && $(MAKE) local-install-files
 
 # Uninstall libltdl
 uninstall-local:

diff --git a/instutil/chmod b/instutil/chmod
deleted file mode 100755 (executable)
index 8849f32..0000000
--- a/instutil/chmod
+++ /dev/null
@@ -1,13 +0,0 @@
-#! /bin/sh
-
-# by Alexandre Oliva <oliva@dcc.unicamp.br>
-
-# Libtool's `make install' uses libltdl's `make dist' to install the
-# libltdl source tree.  automake will try to create directories with
-# mode 777, because the GNU coding standards mandate so, but we don't
-# want installed directories with such modes, so we just ignore such
-# chmods, and leave it up to the installer's umask to do the right
-# thing.
-
-test x"$1" = x"777" && echo Possibly unsafe chmod ignored >&2
-exit 0

diff --git a/instutil/ln b/instutil/ln
deleted file mode 100755 (executable)
index 4b9eb40..0000000
--- a/instutil/ln
+++ /dev/null
@@ -1,14 +0,0 @@
-#! /bin/sh
-
-# by Alexandre Oliva <oliva@dcc.unicamp.br>
-
-# Libtool's `make install' uses libltdl's `make dist' to install the
-# libltdl source tree.  automake will try to create hard-links into
-# the source tree by default, to speed things up, but we don't want
-# editing the source tree to mess up the installed version, so we'd
-# better avoid hard links.  Since automake will try `cp' when `ln'
-# fails, we just echo the `cp' command automake will run, to tell
-# installers what's going on, and then fail.
-
-echo cp -p ${1+"$@"}
-exit 1

diff --git a/libltdl/Makefile.am b/libltdl/Makefile.am
index 94e45f8b97463900b062c99d8495d2cdb551c595..831ce281bc33e6444ad167a4f61d9512f876fd15 100644 (file)
--- a/libltdl/Makefile.am
+++ b/libltdl/Makefile.am
@@ -26,3 +26,20 @@ ltdl.lo: ltdl.h config.h
 $(OBJECTS): libtool
 libtool: $(LIBTOOL_DEPS)
        $(SHELL) ./config.status --recheck
+
+## This allows us to install libltdl without using ln and without creating
+## a world writeable directory.
+## FIXME:  Removed 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 -pr $$d/$$file $(DESTDIR)$(datadir)/libtool/libltdl/$$file; \
+         else \
+           test -f $(DESTDIR)$(datadir)/libtool/libltdl/$$file \
+           || cp -p $$d/$$file $(DESTDIR)$(datadir)/libtool/libltdl/$$file || :; \
+         fi; \
+       done
+