From: Tom Tromey <tromey@redhat.com>
Date: Fri, 2 Jan 2004 21:38:07 +0000 (+0000)
Subject: 	* automake.in (handle_source_transform): Don't generate dist
X-Git-Tag: Release-1-8b~109
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8fabb3b2046604764d4ba57224b3b289f7ab98f9;p=thirdparty%2Fautomake.git

	* automake.in (handle_source_transform): Don't generate dist
	variables when no-dist is set.
	(generate_makefile): Likewise.
	* tests/nodist3.test: Ensure that DIST_SOURCES is not created,
	and that dist target does not exist.
        Reported by Tom Fitzsimmons.
---

diff --git a/ChangeLog b/ChangeLog
index 29e564274..c2cb45063 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2004-01-02  Tom Tromey  <tromey@redhat.com>
+
+	* automake.in (handle_source_transform): Don't generate dist
+	variables when no-dist is set.
+	(generate_makefile): Likewise.
+	* tests/nodist3.test: Ensure that DIST_SOURCES is not created,
+	and that dist target does not exist.
+        Reported by Tom Fitzsimmons.
+
 2004-01-02  Alexandre Duret-Lutz  <adl@gnu.org>
 
 	* tests/libtool5.test, tests/ltcond.test, tests/ltcond2.test,
diff --git a/automake.in b/automake.in
index dc54b4457..dd850d689 100755
--- a/automake.in
+++ b/automake.in
@@ -1821,7 +1821,7 @@ sub handle_source_transform ($$$$%)
 	  unless $prefix =~ /EXTRA_/;
 
 	push @sources, "\$($varname)";
-	if ($prefix !~ /^nodist_/)
+	if (! option 'no-dist' && $prefix !~ /^nodist_/)
 	  {
 	    # If the VAR wasn't defined conditionally, we add
 	    # it to DIST_SOURCES as is.  Otherwise we create a
@@ -6896,7 +6896,10 @@ sub generate_makefile ($$)
 
   # Variables used by distdir.am and tags.am.
   define_pretty_variable ('SOURCES', TRUE, INTERNAL, @sources);
-  define_pretty_variable ('DIST_SOURCES', TRUE, INTERNAL, @dist_sources);
+  if (! option 'no-dist')
+    {
+      define_pretty_variable ('DIST_SOURCES', TRUE, INTERNAL, @dist_sources);
+    }
 
   handle_multilib;
   handle_texinfo;
diff --git a/tests/nodist3.test b/tests/nodist3.test
index 8506ffd88..13c4115f0 100755
--- a/tests/nodist3.test
+++ b/tests/nodist3.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2003  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -35,6 +35,7 @@ END
 $ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
-grep '^dist:' Makefile.in
+grep '^dist:' Makefile.in && exit 1
+grep '^DIST_SOURCES =' Makefile.in && exit 1
 
 exit 0