From: Bruno Haible <bruno@clisp.org>
Date: Fri, 6 Dec 2024 10:37:04 +0000 (+0100)
Subject: build: Read POTFILES.in at 'make' time, not at 'configure' time.
X-Git-Tag: v0.24~121
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=93f1239f9d683da2a255aeafe0c85dbab55b60f2;p=thirdparty%2Fgettext.git

build: Read POTFILES.in at 'make' time, not at 'configure' time.

* gettext-runtime/m4/po.m4 (AM_PO_SUBDIRS): Bump GETTEXT_MACRO_VERSION to 0.24.
Don't create POTFILES any more.
(AM_POSTPROCESS_PO_MAKEFILE): Don't substitute POTFILES_DEPS any more.
* gettext-runtime/po/Makefile.in.in (GETTEXT_MACRO_VERSION): Bump to 0.24.
Mention 'make' requirements.
(POTFILES, POTFILES_DEPS): Define with a computed value.
($(DOMAIN).pot-update): Depend on POTFILES_DEPS, not POTFILES.
(distclean): Don't remove POTFILES any more.
* gettext-tools/examples/README: Mention 'make' requirements.
* gettext-tools/examples/po/Makefile.am (POTFILES_DEPS): Define with a computed
value.
* gettext-tools/examples/hello-*/po/Makefile.am (POTFILES_DEPS): Likewise.
---

diff --git a/.gitignore b/.gitignore
index 945cb1574..9294f5685 100644
--- a/.gitignore
+++ b/.gitignore
@@ -633,7 +633,6 @@ autom4te.cache/
 /gettext-runtime/man/x-to-1
 /gettext-runtime/po/Makefile.in
 /gettext-runtime/po/Makefile
-/gettext-runtime/po/POTFILES
 /gettext-runtime/src/Makefile
 # (see DISTCLEANFILES in Makefile.am):
 /gettext-runtime/src/gettext.sh
@@ -667,7 +666,6 @@ autom4te.cache/
 /gettext-tools/misc/gettextize
 /gettext-tools/po/Makefile.in
 /gettext-tools/po/Makefile
-/gettext-tools/po/POTFILES
 /gettext-tools/projects/Makefile
 /gettext-tools/src/Makefile
 /gettext-tools/src/user-email
diff --git a/gettext-runtime/m4/po.m4 b/gettext-runtime/m4/po.m4
index 51475171e..d90001ce5 100644
--- a/gettext-runtime/m4/po.m4
+++ b/gettext-runtime/m4/po.m4
@@ -1,7 +1,6 @@
 # po.m4
-# serial 33 (gettext-0.23)
-dnl Copyright (C) 1995-2014, 2016, 2018-2022, 2024 Free Software Foundation,
-dnl Inc.
+# serial 34 (gettext-0.24)
+dnl Copyright (C) 1995-2024 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -33,7 +32,7 @@ AC_DEFUN([AM_PO_SUBDIRS],
 
   dnl Release version of the gettext macros. This is used to ensure that
   dnl the gettext macros and po/Makefile.in.in are in sync.
-  AC_SUBST([GETTEXT_MACRO_VERSION], [0.22])
+  AC_SUBST([GETTEXT_MACRO_VERSION], [0.24])
 
   dnl Perform the following tests also if --disable-nls has been given,
   dnl because they are needed for "make dist" to work.
@@ -123,10 +122,6 @@ changequote([,])dnl
         # POTFILES.in file. This allows packages to have multiple PO
         # directories under different names or in different locations.
         if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
-          rm -f "$ac_dir/POTFILES"
-          test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
-          gt_tab=`printf '\t'`
-          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ${gt_tab}]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
           POMAKEFILEDEPS="POTFILES.in"
           # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
           # on $ac_dir but don't depend on user-specified configuration
@@ -199,7 +194,7 @@ changequote([,])dnl
             done
           fi
           test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
-          sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
+          sed -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
           for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
             if test -f "$f"; then
               case "$f" in
@@ -299,15 +294,6 @@ x
 '
 changequote([,])dnl
 
-  # Set POTFILES to the value of the Makefile variable POTFILES.
-  sed_x_POTFILES=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/POTFILES/g'`
-  POTFILES=`sed -n -e "$sed_x_POTFILES" < "$ac_file"`
-  # Compute POTFILES_DEPS as
-  #   $(foreach file, $(POTFILES), $(top_srcdir)/$(file))
-  POTFILES_DEPS=
-  for file in $POTFILES; do
-    POTFILES_DEPS="$POTFILES_DEPS "'$(top_srcdir)/'"$file"
-  done
   POMAKEFILEDEPS=""
 
   if test -n "$OBSOLETE_ALL_LINGUAS"; then
@@ -411,7 +397,7 @@ changequote([,])dnl
     done
   fi
 
-  sed -e "s|@POTFILES_DEPS@|$POTFILES_DEPS|g" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@PROPERTIESFILES@|$PROPERTIESFILES|g" -e "s|@CLASSFILES@|$CLASSFILES|g" -e "s|@QMFILES@|$QMFILES|g" -e "s|@MSGFILES@|$MSGFILES|g" -e "s|@RESOURCESDLLFILES@|$RESOURCESDLLFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@JAVACATALOGS@|$JAVACATALOGS|g" -e "s|@QTCATALOGS@|$QTCATALOGS|g" -e "s|@TCLCATALOGS@|$TCLCATALOGS|g" -e "s|@CSHARPCATALOGS@|$CSHARPCATALOGS|g" -e 's,^#distdir:,distdir:,' < "$ac_file" > "$ac_file.tmp"
+  sed -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@PROPERTIESFILES@|$PROPERTIESFILES|g" -e "s|@CLASSFILES@|$CLASSFILES|g" -e "s|@QMFILES@|$QMFILES|g" -e "s|@MSGFILES@|$MSGFILES|g" -e "s|@RESOURCESDLLFILES@|$RESOURCESDLLFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@JAVACATALOGS@|$JAVACATALOGS|g" -e "s|@QTCATALOGS@|$QTCATALOGS|g" -e "s|@TCLCATALOGS@|$TCLCATALOGS|g" -e "s|@CSHARPCATALOGS@|$CSHARPCATALOGS|g" -e 's,^#distdir:,distdir:,' < "$ac_file" > "$ac_file.tmp"
   tab=`printf '\t'`
   if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then
     # Add dependencies that cannot be formulated as a simple suffix rule.
diff --git a/gettext-runtime/po/Makefile.in.in b/gettext-runtime/po/Makefile.in.in
index 8fcc63d20..d2f3a5661 100644
--- a/gettext-runtime/po/Makefile.in.in
+++ b/gettext-runtime/po/Makefile.in.in
@@ -7,8 +7,20 @@
 # notice and this notice are preserved.  This file is offered as-is,
 # without any warranty.
 #
-# Origin: gettext-0.23
-GETTEXT_MACRO_VERSION = 0.22
+# Origin: gettext-0.24
+GETTEXT_MACRO_VERSION = 0.24
+
+# This Makefile makes use of the variable assignment operator != standardized
+# by POSIX:2024
+# <https://pubs.opengroup.org/onlinepubs/9799919799/utilities/make.html>.
+# It thus requires a 'make' implementation that supports this operator !=.
+# As of 2024, these are: GNU make >= 4.0, FreeBSD make, NetBSD make,
+# OpenBSD make. This means that building on specific platforms requires
+# use of GNU make:
+#   - On macOS, use /opt/homebrew/bin/gmake.
+#   - On Solaris 11 OpenIndiana, use /usr/bin/gmake = /usr/gnu/bin/make.
+#   - On Solaris 11.4, install GNU make yourself.
+#   - On AIX, use /opt/freeware/bin/make.
 
 PACKAGE = @PACKAGE@
 VERSION = @VERSION@
@@ -74,7 +86,10 @@ DISTFILES = $(DISTFILES.common) Makevars POTFILES.in \
 $(POFILES) $(GMOFILES) \
 $(DISTFILES.extra1) $(DISTFILES.extra2) $(DISTFILES.extra3)
 
-POTFILES = \
+# The list of files which contain translatable strings.
+POTFILES != sed -e '/^\#/d' < $(srcdir)/POTFILES.in
+# This is computed as $(foreach file, $(POTFILES), $(top_srcdir)/$(file))
+POTFILES_DEPS != for file in $(POTFILES); do echo $(top_srcdir)/$$file; done
 
 CATALOGS = @CATALOGS@
 
@@ -167,7 +182,7 @@ $(srcdir)/stamp-po: $(srcdir)/$(DOMAIN).pot
 # The determination of whether the package xyz is a GNU one is based on the
 # heuristic whether some file in the top level directory mentions "GNU xyz".
 # If GNU 'find' is available, we avoid grepping through monster files.
-$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in
+$(DOMAIN).pot-update: $(POTFILES_DEPS) $(srcdir)/POTFILES.in
 	package_gnu="$(PACKAGE_GNU)"; \
 	test -n "$$package_gnu" || { \
 	  if { if (LC_ALL=C find --version) 2>/dev/null | grep GNU >/dev/null; then \
@@ -401,7 +416,7 @@ mostlyclean:
 clean: mostlyclean
 
 distclean: clean
-	rm -f Makefile Makefile.in POTFILES
+	rm -f Makefile Makefile.in
 
 maintainer-clean: distclean
 	@echo "This command is intended for maintainers to use;"
diff --git a/gettext-tools/examples/README b/gettext-tools/examples/README
index 1deb640c4..e9dfdc7f0 100644
--- a/gettext-tools/examples/README
+++ b/gettext-tools/examples/README
@@ -86,3 +86,14 @@ Makefile types:
     hello-c++-qt               .qm                     Makefile.am
     hello-objc-gnustep         .strings                GNUmakefile
 
+The Makefiles in the po/ directories make use of the variable assignment
+operator != standardized by POSIX:2024
+<https://pubs.opengroup.org/onlinepubs/9799919799/utilities/make.html>.
+They thus require a 'make' implementation that supports this operator !=.
+As of 2024, these are: GNU make >= 4.0, FreeBSD make, NetBSD make,
+OpenBSD make. This means that building on specific platforms requires
+use of GNU make:
+  - On macOS, use /opt/homebrew/bin/gmake.
+  - On Solaris 11 OpenIndiana, use /usr/bin/gmake = /usr/gnu/bin/make.
+  - On Solaris 11.4, install GNU make yourself.
+  - On AIX, use /opt/freeware/bin/make.
diff --git a/gettext-tools/examples/hello-c++-qt/po/Makefile.am b/gettext-tools/examples/hello-c++-qt/po/Makefile.am
index 8076a16e0..35eb52013 100644
--- a/gettext-tools/examples/hello-c++-qt/po/Makefile.am
+++ b/gettext-tools/examples/hello-c++-qt/po/Makefile.am
@@ -72,7 +72,7 @@ MSGCONV = msgconv
 MSGFILTER = msgfilter
 
 # This is computed as $(foreach file, $(POTFILES), $(top_srcdir)/$(file))
-POTFILES_DEPS = @POTFILES_DEPS@
+POTFILES_DEPS != for file in $(POTFILES); do echo $(top_srcdir)/$$file; done
 
 # This is computed as $(foreach lang, $(LINGUAS), $(srcdir)/$(lang).po)
 POFILES = @POFILES@
diff --git a/gettext-tools/examples/hello-c++-wxwidgets/po/Makefile.am b/gettext-tools/examples/hello-c++-wxwidgets/po/Makefile.am
index 7a8247704..f79035309 100644
--- a/gettext-tools/examples/hello-c++-wxwidgets/po/Makefile.am
+++ b/gettext-tools/examples/hello-c++-wxwidgets/po/Makefile.am
@@ -75,7 +75,7 @@ MSGCONV = msgconv
 MSGFILTER = msgfilter
 
 # This is computed as $(foreach file, $(POTFILES), $(top_srcdir)/$(file))
-POTFILES_DEPS = @POTFILES_DEPS@
+POTFILES_DEPS != for file in $(POTFILES); do echo $(top_srcdir)/$$file; done
 
 # This is computed as $(foreach lang, $(LINGUAS), $(srcdir)/$(lang).po)
 POFILES = @POFILES@
diff --git a/gettext-tools/examples/hello-clisp/po/Makefile.am b/gettext-tools/examples/hello-clisp/po/Makefile.am
index 550ca5a18..3455fda85 100644
--- a/gettext-tools/examples/hello-clisp/po/Makefile.am
+++ b/gettext-tools/examples/hello-clisp/po/Makefile.am
@@ -69,7 +69,7 @@ MSGCONV = msgconv
 MSGFILTER = msgfilter
 
 # This is computed as $(foreach file, $(POTFILES), $(top_srcdir)/$(file))
-POTFILES_DEPS = @POTFILES_DEPS@
+POTFILES_DEPS != for file in $(POTFILES); do echo $(top_srcdir)/$$file; done
 
 # This is computed as $(foreach lang, $(LINGUAS), $(srcdir)/$(lang).po)
 POFILES = @POFILES@
diff --git a/gettext-tools/examples/hello-csharp-forms/po/Makefile.am b/gettext-tools/examples/hello-csharp-forms/po/Makefile.am
index fecab3247..fcf89a3ec 100644
--- a/gettext-tools/examples/hello-csharp-forms/po/Makefile.am
+++ b/gettext-tools/examples/hello-csharp-forms/po/Makefile.am
@@ -67,7 +67,7 @@ MSGCONV = msgconv
 MSGFILTER = msgfilter
 
 # This is computed as $(foreach file, $(POTFILES), $(top_srcdir)/$(file))
-POTFILES_DEPS = @POTFILES_DEPS@
+POTFILES_DEPS != for file in $(POTFILES); do echo $(top_srcdir)/$$file; done
 
 # This is computed as $(foreach lang, $(LINGUAS), $(srcdir)/$(lang).po)
 POFILES = @POFILES@
diff --git a/gettext-tools/examples/hello-csharp/po/Makefile.am b/gettext-tools/examples/hello-csharp/po/Makefile.am
index fecab3247..fcf89a3ec 100644
--- a/gettext-tools/examples/hello-csharp/po/Makefile.am
+++ b/gettext-tools/examples/hello-csharp/po/Makefile.am
@@ -67,7 +67,7 @@ MSGCONV = msgconv
 MSGFILTER = msgfilter
 
 # This is computed as $(foreach file, $(POTFILES), $(top_srcdir)/$(file))
-POTFILES_DEPS = @POTFILES_DEPS@
+POTFILES_DEPS != for file in $(POTFILES); do echo $(top_srcdir)/$$file; done
 
 # This is computed as $(foreach lang, $(LINGUAS), $(srcdir)/$(lang).po)
 POFILES = @POFILES@
diff --git a/gettext-tools/examples/hello-gawk/po/Makefile.am b/gettext-tools/examples/hello-gawk/po/Makefile.am
index c0e914db4..1e2bff301 100644
--- a/gettext-tools/examples/hello-gawk/po/Makefile.am
+++ b/gettext-tools/examples/hello-gawk/po/Makefile.am
@@ -69,7 +69,7 @@ MSGCONV = msgconv
 MSGFILTER = msgfilter
 
 # This is computed as $(foreach file, $(POTFILES), $(top_srcdir)/$(file))
-POTFILES_DEPS = @POTFILES_DEPS@
+POTFILES_DEPS != for file in $(POTFILES); do echo $(top_srcdir)/$$file; done
 
 # This is computed as $(foreach lang, $(LINGUAS), $(srcdir)/$(lang).po)
 POFILES = @POFILES@
diff --git a/gettext-tools/examples/hello-guile/po/Makefile.am b/gettext-tools/examples/hello-guile/po/Makefile.am
index 74835039e..7d6fdd204 100644
--- a/gettext-tools/examples/hello-guile/po/Makefile.am
+++ b/gettext-tools/examples/hello-guile/po/Makefile.am
@@ -69,7 +69,7 @@ MSGCONV = msgconv
 MSGFILTER = msgfilter
 
 # This is computed as $(foreach file, $(POTFILES), $(top_srcdir)/$(file))
-POTFILES_DEPS = @POTFILES_DEPS@
+POTFILES_DEPS != for file in $(POTFILES); do echo $(top_srcdir)/$$file; done
 
 # This is computed as $(foreach lang, $(LINGUAS), $(srcdir)/$(lang).po)
 POFILES = @POFILES@
diff --git a/gettext-tools/examples/hello-java-awt/po/Makefile.am b/gettext-tools/examples/hello-java-awt/po/Makefile.am
index 19d5107bf..b72aebf87 100644
--- a/gettext-tools/examples/hello-java-awt/po/Makefile.am
+++ b/gettext-tools/examples/hello-java-awt/po/Makefile.am
@@ -66,7 +66,7 @@ MSGCONV = msgconv
 MSGFILTER = msgfilter
 
 # This is computed as $(foreach file, $(POTFILES), $(top_srcdir)/$(file))
-POTFILES_DEPS = @POTFILES_DEPS@
+POTFILES_DEPS != for file in $(POTFILES); do echo $(top_srcdir)/$$file; done
 
 # This is computed as $(foreach lang, $(LINGUAS), $(srcdir)/$(lang).po)
 POFILES = @POFILES@
diff --git a/gettext-tools/examples/hello-java-qtjambi/po/Makefile.am b/gettext-tools/examples/hello-java-qtjambi/po/Makefile.am
index 19d5107bf..b72aebf87 100644
--- a/gettext-tools/examples/hello-java-qtjambi/po/Makefile.am
+++ b/gettext-tools/examples/hello-java-qtjambi/po/Makefile.am
@@ -66,7 +66,7 @@ MSGCONV = msgconv
 MSGFILTER = msgfilter
 
 # This is computed as $(foreach file, $(POTFILES), $(top_srcdir)/$(file))
-POTFILES_DEPS = @POTFILES_DEPS@
+POTFILES_DEPS != for file in $(POTFILES); do echo $(top_srcdir)/$$file; done
 
 # This is computed as $(foreach lang, $(LINGUAS), $(srcdir)/$(lang).po)
 POFILES = @POFILES@
diff --git a/gettext-tools/examples/hello-java-swing/po/Makefile.am b/gettext-tools/examples/hello-java-swing/po/Makefile.am
index 19d5107bf..b72aebf87 100644
--- a/gettext-tools/examples/hello-java-swing/po/Makefile.am
+++ b/gettext-tools/examples/hello-java-swing/po/Makefile.am
@@ -66,7 +66,7 @@ MSGCONV = msgconv
 MSGFILTER = msgfilter
 
 # This is computed as $(foreach file, $(POTFILES), $(top_srcdir)/$(file))
-POTFILES_DEPS = @POTFILES_DEPS@
+POTFILES_DEPS != for file in $(POTFILES); do echo $(top_srcdir)/$$file; done
 
 # This is computed as $(foreach lang, $(LINGUAS), $(srcdir)/$(lang).po)
 POFILES = @POFILES@
diff --git a/gettext-tools/examples/hello-java/po/Makefile.am b/gettext-tools/examples/hello-java/po/Makefile.am
index 19d5107bf..b72aebf87 100644
--- a/gettext-tools/examples/hello-java/po/Makefile.am
+++ b/gettext-tools/examples/hello-java/po/Makefile.am
@@ -66,7 +66,7 @@ MSGCONV = msgconv
 MSGFILTER = msgfilter
 
 # This is computed as $(foreach file, $(POTFILES), $(top_srcdir)/$(file))
-POTFILES_DEPS = @POTFILES_DEPS@
+POTFILES_DEPS != for file in $(POTFILES); do echo $(top_srcdir)/$$file; done
 
 # This is computed as $(foreach lang, $(LINGUAS), $(srcdir)/$(lang).po)
 POFILES = @POFILES@
diff --git a/gettext-tools/examples/hello-librep/po/Makefile.am b/gettext-tools/examples/hello-librep/po/Makefile.am
index 87c07390d..0caae68fc 100644
--- a/gettext-tools/examples/hello-librep/po/Makefile.am
+++ b/gettext-tools/examples/hello-librep/po/Makefile.am
@@ -69,7 +69,7 @@ MSGCONV = msgconv
 MSGFILTER = msgfilter
 
 # This is computed as $(foreach file, $(POTFILES), $(top_srcdir)/$(file))
-POTFILES_DEPS = @POTFILES_DEPS@
+POTFILES_DEPS != for file in $(POTFILES); do echo $(top_srcdir)/$$file; done
 
 # This is computed as $(foreach lang, $(LINGUAS), $(srcdir)/$(lang).po)
 POFILES = @POFILES@
diff --git a/gettext-tools/examples/hello-pascal/po/Makefile.am b/gettext-tools/examples/hello-pascal/po/Makefile.am
index 26b664cbe..91eec4d82 100644
--- a/gettext-tools/examples/hello-pascal/po/Makefile.am
+++ b/gettext-tools/examples/hello-pascal/po/Makefile.am
@@ -69,7 +69,7 @@ MSGCONV = msgconv
 MSGFILTER = msgfilter
 
 # This is computed as $(foreach file, $(POTFILES), $(top_srcdir)/$(file))
-POTFILES_DEPS = @POTFILES_DEPS@
+POTFILES_DEPS != for file in $(POTFILES); do echo $(top_srcdir)/$$file; done
 
 # This is computed as $(foreach lang, $(LINGUAS), $(srcdir)/$(lang).po)
 POFILES = @POFILES@
diff --git a/gettext-tools/examples/hello-perl/po/Makefile.am b/gettext-tools/examples/hello-perl/po/Makefile.am
index b713c50af..15d18746d 100644
--- a/gettext-tools/examples/hello-perl/po/Makefile.am
+++ b/gettext-tools/examples/hello-perl/po/Makefile.am
@@ -79,7 +79,7 @@ MSGCONV = msgconv
 MSGFILTER = msgfilter
 
 # This is computed as $(foreach file, $(POTFILES), $(top_srcdir)/$(file))
-POTFILES_DEPS = @POTFILES_DEPS@
+POTFILES_DEPS != for file in $(POTFILES); do echo $(top_srcdir)/$$file; done
 
 # This is computed as $(foreach lang, $(LINGUAS), $(srcdir)/$(lang).po)
 POFILES = @POFILES@
diff --git a/gettext-tools/examples/hello-php/po/Makefile.am b/gettext-tools/examples/hello-php/po/Makefile.am
index fc6e2c2c8..47d02b42c 100644
--- a/gettext-tools/examples/hello-php/po/Makefile.am
+++ b/gettext-tools/examples/hello-php/po/Makefile.am
@@ -69,7 +69,7 @@ MSGCONV = msgconv
 MSGFILTER = msgfilter
 
 # This is computed as $(foreach file, $(POTFILES), $(top_srcdir)/$(file))
-POTFILES_DEPS = @POTFILES_DEPS@
+POTFILES_DEPS != for file in $(POTFILES); do echo $(top_srcdir)/$$file; done
 
 # This is computed as $(foreach lang, $(LINGUAS), $(srcdir)/$(lang).po)
 POFILES = @POFILES@
diff --git a/gettext-tools/examples/hello-python/po/Makefile.am b/gettext-tools/examples/hello-python/po/Makefile.am
index 8c88c2941..b13a68a40 100644
--- a/gettext-tools/examples/hello-python/po/Makefile.am
+++ b/gettext-tools/examples/hello-python/po/Makefile.am
@@ -69,7 +69,7 @@ MSGCONV = msgconv
 MSGFILTER = msgfilter
 
 # This is computed as $(foreach file, $(POTFILES), $(top_srcdir)/$(file))
-POTFILES_DEPS = @POTFILES_DEPS@
+POTFILES_DEPS != for file in $(POTFILES); do echo $(top_srcdir)/$$file; done
 
 # This is computed as $(foreach lang, $(LINGUAS), $(srcdir)/$(lang).po)
 POFILES = @POFILES@
diff --git a/gettext-tools/examples/hello-sh/po/Makefile.am b/gettext-tools/examples/hello-sh/po/Makefile.am
index 9852db363..e4702cbce 100644
--- a/gettext-tools/examples/hello-sh/po/Makefile.am
+++ b/gettext-tools/examples/hello-sh/po/Makefile.am
@@ -69,7 +69,7 @@ MSGCONV = msgconv
 MSGFILTER = msgfilter
 
 # This is computed as $(foreach file, $(POTFILES), $(top_srcdir)/$(file))
-POTFILES_DEPS = @POTFILES_DEPS@
+POTFILES_DEPS != for file in $(POTFILES); do echo $(top_srcdir)/$$file; done
 
 # This is computed as $(foreach lang, $(LINGUAS), $(srcdir)/$(lang).po)
 POFILES = @POFILES@
diff --git a/gettext-tools/examples/hello-smalltalk/po/Makefile.am b/gettext-tools/examples/hello-smalltalk/po/Makefile.am
index 3fcea3a21..f33f4b5ba 100644
--- a/gettext-tools/examples/hello-smalltalk/po/Makefile.am
+++ b/gettext-tools/examples/hello-smalltalk/po/Makefile.am
@@ -69,7 +69,7 @@ MSGCONV = msgconv
 MSGFILTER = msgfilter
 
 # This is computed as $(foreach file, $(POTFILES), $(top_srcdir)/$(file))
-POTFILES_DEPS = @POTFILES_DEPS@
+POTFILES_DEPS != for file in $(POTFILES); do echo $(top_srcdir)/$$file; done
 
 # This is computed as $(foreach lang, $(LINGUAS), $(srcdir)/$(lang).po)
 POFILES = @POFILES@
diff --git a/gettext-tools/examples/hello-tcl-tk/po/Makefile.am b/gettext-tools/examples/hello-tcl-tk/po/Makefile.am
index 485c02f63..5ac95cf22 100644
--- a/gettext-tools/examples/hello-tcl-tk/po/Makefile.am
+++ b/gettext-tools/examples/hello-tcl-tk/po/Makefile.am
@@ -65,7 +65,7 @@ MSGCONV = msgconv
 MSGFILTER = msgfilter
 
 # This is computed as $(foreach file, $(POTFILES), $(top_srcdir)/$(file))
-POTFILES_DEPS = @POTFILES_DEPS@
+POTFILES_DEPS != for file in $(POTFILES); do echo $(top_srcdir)/$$file; done
 
 # This is computed as $(foreach lang, $(LINGUAS), $(srcdir)/$(lang).po)
 POFILES = @POFILES@
diff --git a/gettext-tools/examples/hello-tcl/po/Makefile.am b/gettext-tools/examples/hello-tcl/po/Makefile.am
index 485c02f63..5ac95cf22 100644
--- a/gettext-tools/examples/hello-tcl/po/Makefile.am
+++ b/gettext-tools/examples/hello-tcl/po/Makefile.am
@@ -65,7 +65,7 @@ MSGCONV = msgconv
 MSGFILTER = msgfilter
 
 # This is computed as $(foreach file, $(POTFILES), $(top_srcdir)/$(file))
-POTFILES_DEPS = @POTFILES_DEPS@
+POTFILES_DEPS != for file in $(POTFILES); do echo $(top_srcdir)/$$file; done
 
 # This is computed as $(foreach lang, $(LINGUAS), $(srcdir)/$(lang).po)
 POFILES = @POFILES@
diff --git a/gettext-tools/examples/hello-ycp/po/Makefile.am b/gettext-tools/examples/hello-ycp/po/Makefile.am
index 533c3e128..a0921b290 100644
--- a/gettext-tools/examples/hello-ycp/po/Makefile.am
+++ b/gettext-tools/examples/hello-ycp/po/Makefile.am
@@ -69,7 +69,7 @@ MSGCONV = msgconv
 MSGFILTER = msgfilter
 
 # This is computed as $(foreach file, $(POTFILES), $(top_srcdir)/$(file))
-POTFILES_DEPS = @POTFILES_DEPS@
+POTFILES_DEPS != for file in $(POTFILES); do echo $(top_srcdir)/$$file; done
 
 # This is computed as $(foreach lang, $(LINGUAS), $(srcdir)/$(lang).po)
 POFILES = @POFILES@
diff --git a/gettext-tools/examples/po/Makefile.am b/gettext-tools/examples/po/Makefile.am
index 488e5d24a..2bacff0f6 100644
--- a/gettext-tools/examples/po/Makefile.am
+++ b/gettext-tools/examples/po/Makefile.am
@@ -145,7 +145,7 @@ MSGCONV = msgconv
 MSGFILTER = msgfilter
 
 # This is computed as $(foreach file, $(POTFILES), $(top_srcdir)/$(file))
-POTFILES_DEPS = @POTFILES_DEPS@
+POTFILES_DEPS != for file in $(POTFILES); do echo $(top_srcdir)/$$file; done
 
 # This is computed as $(foreach lang, $(LINGUAS), $(srcdir)/$(lang).po)
 POFILES = @POFILES@