* Makefile.am (install-data-hook): install libltdl as a directory,

not as a tar-file, so that we do not modify the build tree at make
install time
* libtoolize.in (ltdl, ltdl_tar): update

diff --git a/ChangeLog b/ChangeLog
index 58d73e5855fac6466fd0b8d97910060f595cb941..885f64a596a457739908ccea86dcc255cda87e03 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 1999-03-09  Alexandre Oliva  <oliva@dcc.unicamp.br>
 
+       * Makefile.am (install-data-hook): install libltdl as a directory, 
+       not as a tar-file, so that we do not modify the build tree at make 
+       install time
+       * libtoolize.in (ltdl, ltdl_tar): update
+
        * configure.in, Makefile.am, NEWS: install libltdl by default
 
        * libtool.m4 (AC_LIBLTDL_INSTALLABLE, AC_LIBLTDL_CONVENIENCE):

diff --git a/Makefile.am b/Makefile.am
index a87a9e515fdeda9a009294cea4ae80e7bac802c4..7cc583be2730f4fa0630b993cb2fe53f45dd0dff 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,7 +15,7 @@ aclocal_macros = libtool.m4
 
 EXTRA_DIST = $(aclocal_macros) libtoolize.in ltconfig.in ltmain.in \
        libtool.spec
-CLEANFILES = libtool libtoolize ltconfig.T ltmain.shT libltdl.tar.gz
+CLEANFILES = libtool libtoolize ltconfig.T ltmain.shT
 
 # These are required by libtoolize.
 pkgdata_SCRIPTS = config.guess config.sub ltconfig
@@ -93,18 +93,9 @@ configure-subdirs distdir: $(DIST_MAKEFILE_LIST)
        abs_srcdir=`cd $(top_srcdir) && pwd`; \
        (cd $$dir && $$abs_srcdir/$$dir/configure) || exit 1
 
-# Create and install libltdl.tar.gz
-install-data-hook: libltdl/Makefile
-       @echo 'cd libltdl && $(MAKE) distdir distdir=libltdl && tar -cf libltdl.tar libltdl && gzip $(GZIP_ENV) libltdl.tar'
-       @if (cd libltdl && $(MAKE) distdir distdir=libltdl && \
-        tar -cf libltdl.tar libltdl && \
-        gzip $(GZIP_ENV) libltdl.tar); then \
-         echo "$(INSTALL_DATA) libltdl/libltdl.tar.gz $(pkgdatadir)/libltdl.tar.gz"; \
-         $(INSTALL_DATA) libltdl/libltdl.tar.gz $(pkgdatadir)/libltdl.tar.gz; \
-       else \
-         echo "Warning: without gzip, libtool cannot install libltdl.tar.gz"; \
-       fi; \
-       rm -rf libltdl/libltdl libltdl/libltdl.tar libltdl/libltdl.tar.gz
+# Create and install libltdl
+install-data-hook:
+       cd libltdl && $(MAKE) distdir distdir=$(DESTDIR)$(pkgdatadir)/libltdl
 
 ################################################################
 ##

diff --git a/libtoolize.in b/libtoolize.in
index 12dc87d143f06db6072a18116aea4996a30feef0..83876d8f640815e4a045189ee4b970298edad0e5 100644 (file)
--- a/libtoolize.in
+++ b/libtoolize.in
@@ -44,6 +44,7 @@ help="Try \`$progname --help' for more information."
 rm="rm -f"
 ln_s="ln -s"
 cp="cp -f"
+mkdir="mkdir"
 
 # Global variables.
 automake=
@@ -102,6 +103,7 @@ EOF
       rm="echo $rm"
       test -n "$ln_s" && ln_s="echo $ln_s"
       cp="echo $cp"
+      mkdir="echo mkdir"
     fi
     ;;
 
@@ -111,11 +113,9 @@ EOF
 
   --ltdl)
     ltdl=yes
-    ltdl_tar=
     ;;
 
   --ltdl-tar)
-    ltdl=
     ltdl_tar=yes
     ;;
 
@@ -146,7 +146,6 @@ if test -z "$files"; then
   exit 1
 fi
 files='config.guess config.sub ltconfig ltmain.sh'
-test "x$ltdl_tar" = xyes && files="$files libltdl.tar.gz"
 
 auxdir=.
 auxdirline=`egrep '^AC_CONFIG_AUX_DIR' configure.in 2>/dev/null`
@@ -228,14 +227,14 @@ if test -z "$automake"; then
 fi
 
 
-# Change to the auxillary directory.
-if test "$auxdir" != .; then
-  test -z "$automake" && echo "Putting files in AC_CONFIG_AUX_DIR, \`$auxdir'."
-  cd $auxdir || exit 1
+if test "x$ltdl" = xyes; then
+  test -d libltdl || $mkdir libltdl
+  ltdlfiles=`cd $pkgdatadir && ls libltdl/*`
+else
+  ltdlfiles=
 fi
 
-
-for file in $files; do
+for file in $ltdlfiles; do
   if test -f "$file" && test -z "$force"; then
     test -z "$automake" && echo "$progname: \`$file' exists: use \`--force' to overwrite" 1>&2
     continue
@@ -250,14 +249,37 @@ for file in $files; do
   fi
 done
 
-if test "x$ltdl" = xyes; then
-  if tar xzf $pkgdatadir/libltdl.tar.gz; then :
+if test "x$ltdl_tar" = x"yes"; then
+  if test "x$dry_run" = x"yes"; then
+    echo "(cd $pkgdatadir > /dev/null && tar -cf - libltdl | gzip --best) > libltdl.tar.gz"
+  elif test -f libltdl.tar.gz && test -z "$force"; then
+    test -z "$automake" && echo "$progname: \`libltdl.tar.gz' exists: use \`--force' to overwrite" 1>&2
   else
-    echo "$progname: cannot unpack libltdl.tar.gz" 1>&2
-    status=1
+    (cd $pkgdatadir > /dev/null && tar -cf - libltdl | gzip --best) > libltdl.tar.gz
   fi
 fi
 
+# Change to the auxiliary directory.
+if test "$auxdir" != .; then
+  test -z "$automake" && echo "Putting files in AC_CONFIG_AUX_DIR, \`$auxdir'."
+  cd $auxdir || exit 1
+fi
+
+for file in $files; do
+  if test -f "$file" && test -z "$force"; then
+    test -z "$automake" && echo "$progname: \`$file' exists: use \`--force' to overwrite" 1>&2
+    continue
+  fi
+
+  $rm $file
+  if test -n "$ln_s" && $ln_s $pkgdatadir/$file $file; then :
+  elif $cp $pkgdatadir/$file $file; then :
+  else
+    echo "$progname: cannot copy \`$pkgdatadir/$file' to \`$file'" 1>&2
+    status=1
+  fi
+done
+
 exit $status
 
 # Local Variables: