From 5915bc314f2e76fd407fa89414066f52b91724b3 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 7 Dec 2024 09:40:00 +0100 Subject: [PATCH] build: Include Makevars at 'make' time, not at 'configure' time. * gettext-runtime/m4/po.m4 (AM_PO_SUBDIRS): Don't splice in Makevars here. * gettext-runtime/po/Makefile.in.in: Include Makevars explicitly. --- gettext-runtime/m4/po.m4 | 2 +- gettext-runtime/po/Makefile.in.in | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/gettext-runtime/m4/po.m4 b/gettext-runtime/m4/po.m4 index 1c1d11cfc..0d23782f9 100644 --- a/gettext-runtime/m4/po.m4 +++ b/gettext-runtime/m4/po.m4 @@ -128,7 +128,7 @@ changequote([,])dnl # directories under different names or in different locations. if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile" - sed -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" "$ac_dir/Makefile.in" > "$ac_dir/Makefile" + cat "$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 diff --git a/gettext-runtime/po/Makefile.in.in b/gettext-runtime/po/Makefile.in.in index 04ad6c297..2d87ff8c1 100644 --- a/gettext-runtime/po/Makefile.in.in +++ b/gettext-runtime/po/Makefile.in.in @@ -134,7 +134,8 @@ DISTFILESDEPS_yes = $(DISTFILESDEPS_) DISTFILESDEPS_no = DISTFILESDEPS = $(DISTFILESDEPS_$(DIST_DEPENDS_ON_UPDATE_PO)) -# Makevars gets inserted here. (Don't remove this line!) +# Include the customization of this po/ directory. +include $(srcdir)/Makevars all: all-@USE_NLS@ -- 2.47.3