* instutil/chmod: New script to avoid chmod'ing files while

installing libltdl's sources.
* instutil/ln: New script to avoid hard-linking libltdl's sources
in the install tree.
* Makefile.am (EXTRA_DIST): Dist them.
(instal-data-hook): Add srcdir/instutil to the beginning of the
PATH before installing libltdl's sources.

diff --git a/ChangeLog b/ChangeLog
index 43a3311997825991164dcad151a6ea08a591db64..2a998b3162c51f2aaeefe4a1eab582ae9e7462bf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+1999-05-14  Alexandre Oliva  <oliva@dcc.unicamp.br>
+
+       * instutil/chmod: New script to avoid chmod'ing files while
+       installing libltdl's sources.
+       * instutil/ln: New script to avoid hard-linking libltdl's sources
+       in the install tree.
+       * Makefile.am (EXTRA_DIST): Dist them.
+       (instal-data-hook): Add srcdir/instutil to the beginning of the
+       PATH before installing libltdl's sources.
+
 1999-05-06  Gary V. Vaughan  <gary@oranda.demon.co.uk>
 
        * Makefile.am (install-data-hook):  make sure the install directory

diff --git a/Makefile.am b/Makefile.am
index 0b7dc1b11b171aeaf82b4cd22b63ae059d647f1a..7af058efa9da4e31807a6eaf4ae9cd999ce93337 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
+       mkstamp ChangeLog.0 instutil/chmod instutil/ln
 CLEANFILES = libtool libtoolize ltconfig.T ltmain.shT
 
 # These are required by libtoolize.
@@ -101,8 +101,8 @@ 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
-       chmod 755 $(DESTDIR)$(pkgdatadir)/libltdl
 
 # Uninstall libltdl
 uninstall-local:

diff --git a/instutil/chmod b/instutil/chmod
new file mode 100755 (executable)
index 0000000..8849f32
--- /dev/null
+++ b/instutil/chmod
@@ -0,0 +1,13 @@
+#! /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
new file mode 100755 (executable)
index 0000000..4b9eb40
--- /dev/null
+++ b/instutil/ln
@@ -0,0 +1,14 @@
+#! /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