From: Tom Tromey <tromey@redhat.com>
Date: Mon, 14 May 2001 05:09:30 +0000 (+0000)
Subject: 	Reported by Rainer Orth:
X-Git-Tag: Release-1-4f~31
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=3419ddcc8ee4f9e45b9edca2822ee897fa9101e3;p=automake.git

	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 a95777c2..2693c895 100644
--- 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 d6e16935..8cb7ba4d 100644
--- 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 fe754c1d..34840ce4 100644
--- 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 fdcf68cc..2c805f8f 100644
--- 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 687eb59f..877dadc8 100644
--- 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
index 00000000..350d58ff
--- /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