From: Bruno Haible <bruno@clisp.org>
Date: Mon, 15 Jul 2024 23:01:07 +0000 (+0200)
Subject: build: Fix "make dist" after switching to automake 1.17.
X-Git-Tag: v0.23~251
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8632b0e57612b3b7b495f3aa4f336eeb673ad0f0;p=thirdparty%2Fgettext.git

build: Fix "make dist" after switching to automake 1.17.

* m4/fixautomake.m4 (FIX_MAKEFILE_TOPDIR_DISTRIB): Also recognize the distdir
rule generated by automake 1.17.
---

diff --git a/m4/fixautomake.m4 b/m4/fixautomake.m4
index 035c56921..bc98541a5 100644
--- a/m4/fixautomake.m4
+++ b/m4/fixautomake.m4
@@ -1,5 +1,5 @@
 # fixautomake.m4
-# serial 8 (gettext-0.18)
+# serial 9 (gettext-0.23)
 dnl Copyright (C) 2002-2024 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
@@ -15,12 +15,17 @@ AC_DEFUN([FIX_MAKEFILE_DISTRIB], [
   mv $ac_file.tmp $ac_file
 ])
 
-dnl Fix an automake-1.9-1.11 bug: the distrib rule is not extensible.
+dnl Fix an automake-1.9-1.17 bug: the distrib rule is not extensible.
 dnl Insert a invocation of the distdir1 target inside the distdir commands,
 dnl after $(distdir) has been erased and re-created.
 AC_DEFUN([FIX_MAKEFILE_TOPDIR_DISTRIB], [
+  dnl The first part of this script is for automake versions < 1.17.
+  dnl The second part is for automake versions >= 1.17.
   sed_script='/mkdir "*\$(distdir)"*$/{a\
 \	$(MAKE) distdir1
+}
+/\$(MKDIR_P) "*\$(distdir)"*$/{a\
+\	$(MAKE) distdir1
 }'
   sed -e "$sed_script" < $ac_file > $ac_file.tmp
   mv $ac_file.tmp $ac_file