* 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 021dbc155446cc91e364827c1824ae350e26193d..ece38e6387f42a7ec04072705ef72141e14d8aee 100644 (file)
--- 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 b7f979d392b0e6e44b2edd97f754e1e5967dd11b..a3e0cc4951dc38701bae2266cf98ac4575b294a7 100644 (file)
--- 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 d9166a89079b0ecd9327287e1ca3c4626d276562..6e3c41b5a655dd66b9df350ca9c876c0d8fd4c2c 100644 (file)
--- 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