1999-11-09 Jim Meyering <meyering@ascend.com>

	* automake.in (handle_dist): Remove the DISTHOOK and GETTEXT
	markers, no matter what.

diff --git a/ChangeLog b/ChangeLog
index f73f2d9c9ac809385196ab64e991f4560b9d1879..7c1a5b81b8eb5bea09e48cd7b59a8bd6d8b0a675 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1999-11-09  Jim Meyering  <meyering@ascend.com>
+
+       * automake.in (handle_dist): Remove the DISTHOOK and GETTEXT
+       markers, no matter what.
+
 1999-11-08  Tom Tromey  <tromey@cygnus.com>
 
        * dist.am (distcheck): Put `&&' at the start of the distcheck-hook

diff --git a/automake.in b/automake.in
index f5cc3752bee923de15a8ee54712c7f99d123fd88..419c7a78fce434c4378f61125f7273b0d1097347 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -2871,11 +2871,19 @@ sub handle_dist
        # Rule to check whether a distribution is viable.
        local ($xform) = '';
 
-       if (! &target_defined ('distcheck-hook'))
+       if (&target_defined ('distcheck-hook'))
+       {
+           $xform .= 's/^DISTHOOK//;';
+       }
+       else
        {
            $xform .= 's/^DISTHOOK.*$//;';
        }
-       if (! $seen_gettext)
+       if ($seen_gettext)
+       {
+           $xform .= '/s^GETTEXT//;';
+       }
+       else
        {
            $xform .= 's/^GETTEXT.*$//;';
        }