From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Sun, 4 Dec 2005 14:48:09 +0000 (+0000)
Subject: * Makefile.am (install-data-local): No continuation here.
X-Git-Tag: release-2-1b~372
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=666de04f3beb8fdd22ef6f787ecfc42ab4021094;p=thirdparty%2Flibtool.git

* Makefile.am (install-data-local): No continuation here.
(dist-hook): Fix copying of README.alpha to README.
* tests/early-libtool.at (configure.ac): Remove
`AM_INIT_AUTOMAKE', we do not use automake in these tests.
---

diff --git a/ChangeLog b/ChangeLog
index 021dbc155..ece38e638 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2005-12-04  Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
 
+	* Makefile.am (install-data-local): No continuation here.
+	(dist-hook): Fix copying of README.alpha to README.
+	* tests/early-libtool.at (configure.ac): Remove
+	`AM_INIT_AUTOMAKE', we do not use automake in these tests.
+
 	* README, README.alpha, libtoolize.m4sh: Typos.
 	* tests/am-subdir.at, tests/duplicate_members.at: Make all
 	banners end with a dot, for symmetry.
diff --git a/Makefile.am b/Makefile.am
index b7f979d39..a3e0cc495 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -308,7 +308,7 @@ install-data-local: libltdl/Makefile.in
 	  f=`echo "$$p" | sed 's|^.*/||'`; \
 	  echo " $(INSTALL_DATA) '$$f' '$(DESTDIR)$(aclocaldir)/$$f'"; \
 	  $(INSTALL_DATA) "$$f" "$(DESTDIR)$(aclocaldir)/$$f"; \
-	done; \
+	done
 ## install the helper scripts
 	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
 	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/config
@@ -347,11 +347,10 @@ uninstall-hook:
 
 dist-hook:
 ## Ship README.alpha only in alpha release, but renamed to README
-	-@test -f $(distdir)/README.alpha && \
+	@if test -f $(srcdir)/README.alpha; then \
 	case $(VERSION) in \
-	  *[a-z]) mv $(distdir)/README.alpha $(distdir)/README ;; \
-	  *)	  rm -f $(distdir)/README.alpha ;; \
-	esac
+	  *[a-z]) cp -p $(srcdir)/README.alpha $(distdir)/README ;; \
+	esac; else :; fi
 
 
 ## ----------- ##
diff --git a/tests/early-libtool.at b/tests/early-libtool.at
index d9166a890..6e3c41b5a 100644
--- a/tests/early-libtool.at
+++ b/tests/early-libtool.at
@@ -29,7 +29,6 @@ AT_SETUP([config.status])
 AT_DATA([configure.ac],
 [[AC_INIT([libtool-demo], ]]AT_PACKAGE_VERSION[[, ]]AT_PACKAGE_BUGREPORT[[)
 AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE
 LT_INIT
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
@@ -122,7 +121,6 @@ AT_SETUP([config.lt])
 AT_DATA([configure.ac],
 [[AC_INIT([libtool-demo], ]]AT_PACKAGE_VERSION[[, ]]AT_PACKAGE_BUGREPORT[[)
 AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE
 LT_INIT
 LT_OUTPUT