From 57ff1c9d1bc2e6741230e256fbe731066f049f8a Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 9 Nov 1999 16:38:49 +0000 Subject: [PATCH] 1999-11-09 Jim Meyering * automake.in (handle_dist): Remove the DISTHOOK and GETTEXT markers, no matter what. --- ChangeLog | 5 +++++ automake.in | 12 ++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index f73f2d9c..7c1a5b81 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +1999-11-09 Jim Meyering + + * automake.in (handle_dist): Remove the DISTHOOK and GETTEXT + markers, no matter what. + 1999-11-08 Tom Tromey * dist.am (distcheck): Put `&&' at the start of the distcheck-hook diff --git a/automake.in b/automake.in index f5cc3752..419c7a78 100755 --- 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.*$//;'; } -- 2.43.5