Rick Scott wrote:
>
> Thanks for the info. It would seem to be a deficiency of the automake make dist
> target. If copies of these files are found within reach they don't get added to
> the distribution.
>
> What we need is a dist-hook target in the top Makefile that will copy the
> automake added files into $(distdir) _if_ they are not there. The source of the
> copy will be either .. or ../.., I think.
Nope, this should not be necessary.
The behavior you describe is the default behavior, but it can be
overriden with AC_CONFIG_AUX_DIR. Adding AC_CONFIG_AUX_DIR(.) to the
toplevel configure.in should force automake to look into . and $srcdir/.
only.
You already seemed to have trying this, but AC_CONFIG_AUX_DIR(.) is
invoked too late . This will force some other macro to pull in
AC_CONFIG_AUX_DIR_DEFAULT which will cause the default rules to take
effect instead of the desired ones. (search for install-sh in configure
and you will see).
Another, similar flaky spot in the toplevel configure.in is not using an
argument in the call to AC_INIT().
The argument is used to detect srcdir - not setting it can cause nasty
effects. The observation of having to set ac_aux_dir=test could be an
indication of such a side-effect.
Please try the patch below.
Ralf
--
Ralf Corsepius
Forschungsinstitut fuer Anwendungsorientierte Wissensverarbeitung (FAW)
Helmholtzstr. 16, 89081 Ulm, Germany Tel: +49/731/501-8690
mailto:[EMAIL PROTECTED] FAX: +49/731/501-999
http://www.faw.uni-ulm.de
Index: configure.in
===================================================================
RCS file: /cvsroot/hungry/lesstif/configure.in,v
retrieving revision 1.205
diff -u -r1.205 configure.in
--- configure.in 2000/04/30 14:23:48 1.205
+++ configure.in 2000/04/30 23:10:11
@@ -5,7 +5,9 @@
dnl $Id: configure.in,v 1.205 2000/04/30 14:23:48 rwscott Exp $
dnl
-AC_INIT()
+AC_INIT(NOTES)
+AC_PREREQ(2.13)
+AC_CONFIG_AUX_DIR(.)
AC_CANONICAL_SYSTEM
@@ -30,8 +32,6 @@
fi
fi
-AC_PREREQ(2.13)
-AC_CONFIG_AUX_DIR(.)
AM_CONFIG_HEADER(include/LTconfig.h)
AC_PROG_CC
AC_AIX
Index: Makefile.am
===================================================================
RCS file: /cvsroot/hungry/lesstif/Makefile.am,v
retrieving revision 1.22
diff -u -r1.22 Makefile.am
--- Makefile.am 2000/04/30 14:23:49 1.22
+++ Makefile.am 2000/04/30 23:10:11
@@ -48,12 +48,3 @@
#install-data-hook:
# ${INSTALL_DATA} $(srcdir)/NOTES $(DESTDIR)$(htmldir)/release-notes.html
-
-dist-hook:
- test -f $(distdir)/config.guess || cp ../config.guess $(distdir) || cp
../../config.guess $(distdir)
- test -f $(distdir)/config.sub || cp ../config.sub $(distdir) || cp
../../config.sub $(distdir)
- test -f $(distdir)/install-sh || cp ../install-sh $(distdir) || cp
../../install-sh $(distdir)
- test -f $(distdir)/ltconfig || cp ../ltconfig $(distdir) || cp ../../ltconfig
$(distdir)
- test -f $(distdir)/ltmain.sh || cp ../ltmain.sh $(distdir) || cp
../../ltmain.sh $(distdir)
- test -f $(distdir)/missing || cp ../missing $(distdir) || cp ../../missing
$(distdir)
- test -f $(distdir)/mkinstalldirs || cp ../mkinstalldirs $(distdir) || cp
../../mkinstalldirs $(distdir)
