From 086c174e8f00919f2ec710ffbb50895badfeb67c Mon Sep 17 00:00:00 2001 From: Alexandre Oliva Date: Mon, 18 Jan 1999 13:16:55 +0000 Subject: [PATCH] * Makefile.am (libltdl.tar.gz): don't create it as part of the build, since it is likely to become stale if we do (install-data-hook): create and install libltdl.tar.gz, without depending on GNU tar Reported by Manfred Weichel --- ChangeLog | 8 ++++++++ Makefile.am | 18 ++++++++++++------ 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index f80cf2daf..4c8da3ca4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +1999-01-18 Alexandre Oliva + + * Makefile.am (libltdl.tar.gz): don't create it as part of the + build, since it is likely to become stale if we do + (install-data-hook): create and install libltdl.tar.gz, without + depending on GNU tar + Reported by Manfred Weichel + 1999-01-17 Thomas Tanner * Makefile.am: added libltdl.tar.gz to CLEANFILES diff --git a/Makefile.am b/Makefile.am index 685ab8dd7..1cf3c7510 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,7 +19,7 @@ CLEANFILES = libtool libtoolize ltconfig.T ltmain.shT libltdl.tar.gz # These are required by libtoolize. pkgdata_SCRIPTS = config.guess config.sub ltconfig -pkgdata_DATA = ltmain.sh libltdl.tar.gz +pkgdata_DATA = ltmain.sh # This macro file should be visible to Automake's aclocal. aclocaldir = @aclocaldir@ @@ -28,11 +28,6 @@ aclocal_DATA = $(aclocal_macros) # The standalone libtool script, and the libtool distributor. bin_SCRIPTS = libtool libtoolize -libltdl.tar.gz: libltdl/Makefile - (cd libltdl && $(MAKE) dist) - rm -f libltdl.tar.gz - ln -s libltdl/libltdl-1.0.tar.gz libltdl.tar.gz - libtool: $(srcdir)/ltmain.sh $(srcdir)/ltconfig CC="$(CC)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" \ LD="$(LD)" LN_S="$(LN_S)" NM="$(NM)" RANLIB="$(RANLIB)" \ @@ -82,6 +77,17 @@ configure-subdirs distdir: $(DIST_MAKEFILE_LIST) abs_srcdir=`cd $(top_srcdir) >/dev/null && pwd`; \ (cd $$dir && $$abs_srcdir/$$dir/configure) || exit 1 +# Create and install libltdl.tar.gz +install-data-hook: libltdl/Makefile + if (cd libltdl && $(MAKE) distdir distdir=libltdl && \ + tar -cf libltdl.tar libltdl && \ + gzip $(GZIP_ENV) libltdl.tar); then \ + $(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 + ################################################################ ## ## Everything past here is useful to the maintainer, but probably not -- 2.47.2