Reported by Rainer Orth:

	* lib/am/distdir.am (?DISTDIR?distdir): Define conditional on
	TOPDIR_P.
	* tests/Makefile.am (TESTS): Added distname.test.
	* tests/distname.test: New file.

diff --git a/ChangeLog b/ChangeLog
index a95777c27df894c3503936ed637b0fda096430a5..2693c8953536a40556d45a6ccd7c13c72b3dbfa7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2001-05-13  Tom Tromey  <tromey@redhat.com>
 
+       Reported by Rainer Orth:
+       * lib/am/distdir.am (?DISTDIR?distdir): Define conditional on
+       TOPDIR_P.
+       * tests/Makefile.am (TESTS): Added distname.test.
+       * tests/distname.test: New file.
+
        * Makefile.am (dist_pkgdata_DATA): Removed.
 
        * tests/defs: Find files to copy in lib/.

diff --git a/THANKS b/THANKS
index d6e16935a48ca58bdee4979d57e9897cbeca2ab1..8cb7ba4d5404462404aad3a53c6d5c614fd76dc9 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -116,6 +116,7 @@ Peter Mattis                petm@scam.XCF.Berkeley.EDU
 Peter Muir             iyhi@yahoo.com
 Petter Reinholdtsen    pere@hungry.com
 Phil Nelson            phil@cs.wwu.edu
+Rainer Orth            ro@techfak.uni-bielefeld.de
 Raja R Harinath                harinath@cs.umn.edu
 Ralf Corsepius         corsepiu@faw.uni-ulm.de
 Ralph Schleicher       rs@purple.UL.BaWue.DE

diff --git a/lib/am/distdir.am b/lib/am/distdir.am
index fe754c1dd10a9fdec0a15d8324b07cff66549a52..34840ce4789632cdc98fc496fa5cc8d186aba28f 100644 (file)
--- a/lib/am/distdir.am
+++ b/lib/am/distdir.am
@@ -22,7 +22,12 @@
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
 top_distdir = %TOP_DISTDIR%
+if %?TOPDIR_P%
+# Avoid unsightly `./'.
+?DISTDIR?distdir = $(PACKAGE)-$(VERSION)
+else !%?TOPDIR_P%
 ?DISTDIR?distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+endif !%?TOPDIR_P%
 
 distdir: $(DISTFILES)
 ##

diff --git a/tests/Makefile.am b/tests/Makefile.am
index fdcf68cc5340f8c7e6ba25058392914b60493244..2c805f8fb5f0470b476e9a56ef1ac69bc9b4db1b 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -99,6 +99,7 @@ depend3.test \
 discover.test \
 distcommon.test \
 distdir.test \
+distname.test \
 double.test \
 dup.test \
 dup2.test \

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 687eb59f87114046b391f4c90955034ab48ea841..877dadc8528c2b6ef80b96be1dac4dd876bf99be 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -171,6 +171,7 @@ depend3.test \
 discover.test \
 distcommon.test \
 distdir.test \
+distname.test \
 double.test \
 dup.test \
 dup2.test \

diff --git a/tests/distname.test b/tests/distname.test
new file mode 100755 (executable)
index 0000000..350d58f
--- /dev/null
+++ b/tests/distname.test
@@ -0,0 +1,35 @@
+#! /bin/sh
+
+# Test of names in tar file.
+# From Rainer Orth
+
+. $srcdir/defs || exit 1
+
+cat > configure.in << 'END'
+AC_INIT(a.c)
+AM_INIT_AUTOMAKE(nonesuch, 0.23)
+AM_PROG_CC_C_O
+AC_PROG_CC
+AC_OUTPUT(Makefile)
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = wish
+wish_SOURCES = a.c
+END
+
+: > a.c
+
+set -e
+
+$needs_autoconf
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --include-deps --copy --add-missing
+./configure
+$MAKE dist
+
+gunzip nonesuch-0.23.tar.gz
+(tar tf nonesuch-0.23.tar | fgrep './nonesuch-0.23/a.c') && exit 1
+exit 0