[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Patch for a bug in distdir
From: |
Alexandre Duret-Lutz |
Subject: |
Re: Patch for a bug in distdir |
Date: |
09 Nov 2001 18:37:51 +0100 |
User-agent: |
Gnus/5.0808 (Gnus v5.8.8) Emacs/21.1 |
>>> "Akim" == Akim Demaille <address@hidden> writes:
>>>>>> "adl" == Alexandre Duret-Lutz <address@hidden> writes:
adl> Does someone object to this change? It has been requested by a
adl> few other people too.
Akim> Nope, please go ahead.
Here is what I've commited.
Index: ChangeLog
===================================================================
RCS file: /cvs/automake/automake/ChangeLog,v
retrieving revision 1.1651
diff -u -r1.1651 ChangeLog
--- ChangeLog 2001/11/09 17:17:45 1.1651
+++ ChangeLog 2001/11/09 17:38:43
@@ -1,5 +1,13 @@
2001-11-09 Alexandre Duret-Lutz <address@hidden>
+ * lib/am/distdir.am (distdir): Also look for directory in build
+ directory first. (See 2001-05-14.)
+ * tests/Makefile.am (TESTS): Add extra5.test.
+ * tests/extra5.test: New file.
+ From Dean Povey.
+
+2001-11-09 Alexandre Duret-Lutz <address@hidden>
+
Fix for distcommon2.test:
* automake.in (automake_needs_to_reprocess_all_files): New
variable.
Index: NEWS
===================================================================
RCS file: /cvs/automake/automake/NEWS,v
retrieving revision 1.158
diff -u -r1.158 NEWS
--- NEWS 2001/11/09 17:17:46 1.158
+++ NEWS 2001/11/09 17:38:43
@@ -8,6 +8,7 @@
are no longer shipped, since Autoconf 2.52 provides them (both as AM_
and AC_).
* `#line' of Lex and Yacc files are properly set.
+* EXTRA_DIST can contain generated directories.
* Fixed CDPATH portability problems, in particular for MacOS X.
* Fixed handling of nobase_ targets.
* Fixed support of implicit rules leading to .lo objects.
Index: THANKS
===================================================================
RCS file: /cvs/automake/automake/THANKS,v
retrieving revision 1.154
diff -u -r1.154 THANKS
--- THANKS 2001/11/05 17:32:08 1.154
+++ THANKS 2001/11/09 17:38:43
@@ -33,6 +33,7 @@
Dave Morrison address@hidden
David A. Swierczek address@hidden
David Zaroski address@hidden
+Dean Povey address@hidden
Derek R. Price address@hidden
Dieter Baron address@hidden
Dmitry Mikhin address@hidden
Index: lib/am/distdir.am
===================================================================
RCS file: /cvs/automake/automake/lib/am/distdir.am,v
retrieving revision 1.25
diff -u -r1.25 distdir.am
--- distdir.am 2001/11/07 08:03:53 1.25
+++ distdir.am 2001/11/09 17:38:44
@@ -65,9 +65,10 @@
##
## Always look for the file in the build directory first. That way
## for something like yacc output we will correctly pick up the latest
-## version.
+## version. Also check for directories in the build directory first,
+## so one can ship generated directories.
##
- if test -f $$file; then d=.; else d=$(srcdir); fi; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
##
## Make the subdirectory for the file. This is going to make `dist'
## really crawl, but it seems like the only way to do it, given that
Index: tests/Makefile.am
===================================================================
RCS file: /cvs/automake/automake/tests/Makefile.am,v
retrieving revision 1.353
diff -u -r1.353 Makefile.am
--- Makefile.am 2001/11/09 17:17:47 1.353
+++ Makefile.am 2001/11/09 17:38:44
@@ -138,6 +138,7 @@
extra.test \
extra3.test \
extra4.test \
+extra5.test \
flibs.test \
fnoc.test \
fo.test \
Index: tests/Makefile.in
===================================================================
RCS file: /cvs/automake/automake/tests/Makefile.in,v
retrieving revision 1.458
diff -u -r1.458 Makefile.in
--- Makefile.in 2001/11/09 17:17:47 1.458
+++ Makefile.in 2001/11/09 17:38:44
@@ -211,6 +211,7 @@
extra.test \
extra3.test \
extra4.test \
+extra5.test \
flibs.test \
fnoc.test \
fo.test \
@@ -486,7 +487,7 @@
distdir: $(DISTFILES)
@for file in $(DISTFILES); do \
- if test -f $$file; then d=.; else d=$(srcdir); fi; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
$(mkinstalldirs) "$(distdir)/$$dir"; \
Index: tests/extra5.test
===================================================================
RCS file: extra5.test
diff -N extra5.test
--- /dev/null Tue May 5 13:32:27 1998
+++ extra5.test Fri Nov 9 09:38:44 2001
@@ -0,0 +1,26 @@
+#! /bin/sh
+
+# Check to make sure EXTRA_DIST can contain a directory from $buildir.
+# From Dean Povey.
+
+. $srcdir/defs || exit 1
+
+echo AC_OUTPUT >> configure.in
+
+cat > Makefile.am << 'END'
+EXTRA_DIST=foo
+
+foo:
+ mkdir foo
+ touch foo/bar
+END
+
+set -e
+
+$ACLOCAL
+$AUTOMAKE
+$AUTOCONF
+mkdir build
+cd build
+../configure
+make distdir
--
Alexandre Duret-Lutz