libltdl/Makefile.in DIST_COMMON issue

[Ralf Wildenhues]

Ugly issue.  :-/

libtool/libltdl/Makefile.in created by automake-1.9 contains

DIST_COMMON = README $(am__configure_deps) $(am__include_HEADERS_DIST) \
        $(am__ltdlinclude_HEADERS_DIST) $(srcdir)/Makefile.am \
        $(srcdir)/Makefile.in $(srcdir)/config-h.in \
        $(top_srcdir)/configure COPYING.LIB argz.c config/compile \
        config/config.guess config/config.sub config/depcomp \
        config/install-sh config/ltmain.sh config/mdate-sh \
        config/missing config/texinfo.tex lt__dirent.c lt__strl.c

but the subtree created by `libtoolize --ltdl' lacks
  config/mdate-sh config/texinfo.tex
(and we surely don't want to change that).  So a `make dist' in the
client package will fail.

automake-1.7 also wants to add mkinstalldirs, and automake-1.6 barfs
over the Makefile.am (and ltdl.m4 contents) anyway, so I guess the hack
below should fix that for now.  It has a race triggerable by a full disk
or a system crash (can Automake output be directed someplace else?), but
should otherwise be fine.  OK to apply?

Note that this change requires that the libtool package be built with
automake >= 1.9 (which we do anyway), but the client should still be
able to re-bootstrap with older automake (and use and distribute
mkinstalldirs then).

Furthermore, we must also fix `libtoolize --ltdl' to update the
timestamps, and not use `tar', so that client packages are rebuilt
correctly after updating ltdl.  May look into this later..

Cheers,
Ralf

        * Makefile.am (libltdl/Makefile.in): Do not distribute the
        auxiliary files that are not used by libltdl, so that
        packages that use `libtoolize --ltdl' can `make dist'
        successfully.

Index: Makefile.am
===================================================================
RCS file: /cvsroot/libtool/libtool/Makefile.am,v
retrieving revision 1.166
diff -u -r1.166 Makefile.am
--- Makefile.am 27 Sep 2005 10:03:49 -0000      1.166
+++ Makefile.am 28 Sep 2005 15:50:48 -0000
@@ -215,6 +216,9 @@
 
 $(srcdir)/libltdl/Makefile.in: $(srcdir)/libltdl/Makefile.am
        cd $(srcdir)/libltdl && $(AUTOMAKE) Makefile
+       sed -e 's,config/mdate-sh,,' -e 's,config/texinfo.tex,,' \
+           -e 's,config/mkinstalldirs,,' < $@ > address@hidden
+       mv -f address@hidden $@
 
 # We want the libltdl files to be up to date as much as possible.
 all-local: $(srcdir)/libltdl/Makefile.in