FYI: more trivial fixes; README.alpha handling

[Ralf Wildenhues]

The test for README.alpha was bogus.  Nothing copied it over into
$(distdir).  Now we do that manually.  Note you can't put it in
EXTRA_DIST either, because then, it won't be present in the tarball,
(since we may move it over to `README', or delete it), then `distcheck'
will naturally fail, because the source file isn't present any more.
Also, change `test -f $file || $do_something' to use if..then so that
the rule does not exit with one in either case, keeping `make' from
outputting something like `error (ignored)'.

The rest is pretty trivial -- thus I deemed this would probably be ok to
apply right away.  :)

Cheers,
Ralf

        * 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.

Index: Makefile.am
===================================================================
RCS file: /cvsroot/libtool/libtool/Makefile.am,v
retrieving revision 1.181
diff -u -r1.181 Makefile.am
--- Makefile.am 3 Dec 2005 08:33:46 -0000       1.181
+++ Makefile.am 4 Dec 2005 13:29:57 -0000
@@ -308,7 +331,7 @@
          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 +370,10 @@
 
 dist-hook:
 ## Ship README.alpha only in alpha release, but renamed to README
-       address@hidden -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
 
 
 ## ----------- ##
Index: tests/early-libtool.at
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/early-libtool.at,v
retrieving revision 1.6
diff -u -r1.6 early-libtool.at
--- tests/early-libtool.at      5 Oct 2005 08:58:19 -0000       1.6
+++ tests/early-libtool.at      4 Dec 2005 12:48:11 -0000
@@ -29,7 +29,6 @@
 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_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