From: Bruno Haible Date: Thu, 23 Jan 2025 22:58:12 +0000 (+0100) Subject: Temporarily revert "po: Rename Makefile.in.in to Makefile.in." X-Git-Tag: v0.24~54 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c39e75be33d70b5fd7c053407cfdc979f7f6fc97;p=thirdparty%2Fgettext.git Temporarily revert "po: Rename Makefile.in.in to Makefile.in." --- diff --git a/.gitignore b/.gitignore index dcf5660ae..0a1bb6588 100644 --- a/.gitignore +++ b/.gitignore @@ -412,7 +412,7 @@ /gettext-tools/examples/ChangeLog # Files copied from gettext-runtime: /gettext-tools/ABOUT-NLS -/gettext-tools/po/Makefile.in +/gettext-tools/po/Makefile.in.in /gettext-tools/po/Rules-quot /gettext-tools/po/boldquot.sed /gettext-tools/po/en@boldquot.header diff --git a/Admin/release-steps b/Admin/release-steps index 2e5d2555d..6afb05966 100644 --- a/Admin/release-steps +++ b/Admin/release-steps @@ -75,7 +75,7 @@ We assume that the following environment variables are set: run.sh in gettext-runtime/doc/Admin/. Copy resulting matrix.texi into gettext-runtime/doc/. Update the STATUS date in nls.texi. - - gettext-runtime/po/Makefile.in + - gettext-runtime/po/Makefile.in.in Update Origin version. diff --git a/Makefile.am b/Makefile.am index 5226a3bf3..4d2eef449 100644 --- a/Makefile.am +++ b/Makefile.am @@ -66,7 +66,7 @@ $(srcdir)/configure: $(srcdir)/gettext-runtime/configure.ac $(srcdir)/gettext-to distcheck-hook: # Verify that some files are the same. - cmp -s $(srcdir)/gettext-runtime/po/Makefile.in $(srcdir)/gettext-tools/po/Makefile.in + cmp -s $(srcdir)/gettext-runtime/po/Makefile.in.in $(srcdir)/gettext-tools/po/Makefile.in.in cmp -s $(srcdir)/gettext-runtime/po/Rules-quot $(srcdir)/gettext-tools/po/Rules-quot cmp -s $(srcdir)/gettext-runtime/po/boldquot.sed $(srcdir)/gettext-tools/po/boldquot.sed cmp -s $(srcdir)/gettext-runtime/po/quot.sed $(srcdir)/gettext-tools/po/quot.sed diff --git a/NEWS b/NEWS index a9886bfe7..661140656 100644 --- a/NEWS +++ b/NEWS @@ -1,8 +1,5 @@ Version 0.24 - January 2025 -# Improvements for maintainers: - * The contents of the po/ directory has been changed: - - A file Makefile.in replaces the old Makefile.in.in. # Programming languages support: * JavaScript: - xgettext now parses recursive JSX expressions correctly. diff --git a/autogen.sh b/autogen.sh index 3d70de01c..cf22fa1d4 100755 --- a/autogen.sh +++ b/autogen.sh @@ -540,7 +540,7 @@ cd "$dir0" echo "$0: copying common files from gettext-runtime to gettext-tools..." cp -p gettext-runtime/ABOUT-NLS gettext-tools/ABOUT-NLS -cp -p gettext-runtime/po/Makefile.in gettext-tools/po/Makefile.in +cp -p gettext-runtime/po/Makefile.in.in gettext-tools/po/Makefile.in.in cp -p gettext-runtime/po/Rules-quot gettext-tools/po/Rules-quot cp -p gettext-runtime/po/boldquot.sed gettext-tools/po/boldquot.sed cp -p gettext-runtime/po/quot.sed gettext-tools/po/quot.sed diff --git a/gettext-runtime/Makefile.am b/gettext-runtime/Makefile.am index 32e11cfe7..24925e95c 100644 --- a/gettext-runtime/Makefile.am +++ b/gettext-runtime/Makefile.am @@ -65,5 +65,5 @@ gen-man1: src/gettext.c man/gettext.x \ maintainer-update-po: $(top_builddir)/config.status $(SHELL) ./config.status --recheck - $(SHELL) ./config.status po/Makefile + $(SHELL) ./config.status po/Makefile.in po-directories cd po && $(MAKE) update-po diff --git a/gettext-runtime/configure.ac b/gettext-runtime/configure.ac index cde0657dd..bb3c02866 100644 --- a/gettext-runtime/configure.ac +++ b/gettext-runtime/configure.ac @@ -218,7 +218,7 @@ AC_CONFIG_FILES([gnulib-lib/Makefile]) AC_CONFIG_FILES([src/Makefile]) AC_CONFIG_FILES([src/gettext.sh], [chmod a+x src/gettext.sh]) -AC_CONFIG_FILES([po/Makefile]) +AC_CONFIG_FILES([po/Makefile.in]) AC_CONFIG_FILES([man/Makefile]) AC_CONFIG_FILES([man/x-to-1]) diff --git a/gettext-runtime/m4/po.m4 b/gettext-runtime/m4/po.m4 index 7fd631381..73e0436bd 100644 --- a/gettext-runtime/m4/po.m4 +++ b/gettext-runtime/m4/po.m4 @@ -31,7 +31,7 @@ AC_DEFUN([AM_PO_SUBDIRS], AC_REQUIRE([AM_NLS])dnl dnl Release version of the gettext macros. This is used to ensure that - dnl the gettext macros and po/Makefile.in are in sync. + dnl the gettext macros and po/Makefile.in.in are in sync. AC_SUBST([GETTEXT_MACRO_VERSION], [0.24]) dnl Perform the following tests also if --disable-nls has been given, @@ -107,6 +107,33 @@ changequote([,])dnl dnl the set of available translations, given by the developer). DESIRED_LINGUAS="${LINGUAS-\$(ALL_LINGUAS)}" AC_SUBST([DESIRED_LINGUAS]) + + AC_CONFIG_COMMANDS([po-directories], [[ + for ac_file in $CONFIG_FILES; do + # Support "outfile[:infile[:infile...]]" + case "$ac_file" in + *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; + esac + # PO directories have a Makefile.in generated from Makefile.in.in. + case "$ac_file" in */Makefile.in) + # Adjust a relative srcdir. + ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` + ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'` + ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` + # In autoconf-2.13 it is called $ac_given_srcdir. + # In autoconf-2.50 it is called $srcdir. + test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir" + # Treat a directory as a PO directory if and only if it has a + # 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 + test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile" + cat "$ac_dir/Makefile.in" > "$ac_dir/Makefile" + fi + ;; + esac + done]], + []) ]) dnl Postprocesses a Makefile in a directory containing PO files. diff --git a/gettext-runtime/po/Makefile.in b/gettext-runtime/po/Makefile.in.in similarity index 98% rename from gettext-runtime/po/Makefile.in rename to gettext-runtime/po/Makefile.in.in index 7fb3979de..7b8b00e15 100644 --- a/gettext-runtime/po/Makefile.in +++ b/gettext-runtime/po/Makefile.in.in @@ -97,7 +97,7 @@ UPDATEPOFILES != for lang in $(ALL_LINGUAS); do echo $$lang.po-update; done DUMMYPOFILES != for lang in $(ALL_LINGUAS); do echo $$lang.nop; done DISTFILES.common = \ - remove-potcdate.sed \ + Makefile.in.in remove-potcdate.sed \ $(DISTFILES.common.extra1) $(DISTFILES.common.extra2) \ $(DISTFILES.common.extra3) $(DISTFILES.common.extra4) \ $(DISTFILES.common.extra5) $(DISTFILES.common.extra6) @@ -181,10 +181,10 @@ $(GMOFILES): $(srcdir)/$(DOMAIN).pot all-yes: $(srcdir)/stamp-po all-no: -# Ensure that the gettext macros and this Makefile.in are in sync. +# Ensure that the gettext macros and this Makefile.in.in are in sync. CHECK_MACRO_VERSION = \ test "$(GETTEXT_MACRO_VERSION)" = "@GETTEXT_MACRO_VERSION@" \ - || { echo "*** error: gettext infrastructure mismatch: using a Makefile.in from gettext version $(GETTEXT_MACRO_VERSION) but the autoconf macros are from gettext version @GETTEXT_MACRO_VERSION@" 1>&2; \ + || { echo "*** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version $(GETTEXT_MACRO_VERSION) but the autoconf macros are from gettext version @GETTEXT_MACRO_VERSION@" 1>&2; \ exit 1; \ } @@ -451,7 +451,7 @@ mostlyclean: clean: mostlyclean distclean: clean - rm -f Makefile + rm -f Makefile Makefile.in maintainer-clean: distclean @echo "This command is intended for maintainers to use;" @@ -563,9 +563,9 @@ include $(RULES_FILES) # because execution permission bits may not work on the current file system. # Use @SHELL@, which is the shell determined by autoconf for the use by its # scripts, not $(SHELL) which is hardwired to /bin/sh and may be deficient. -Makefile: Makefile.in Makevars $(top_builddir)/config.status +Makefile: Makefile.in.in Makevars $(top_builddir)/config.status cd $(top_builddir) \ - && @SHELL@ ./config.status $(subdir)/$@ + && @SHELL@ ./config.status $(subdir)/$@.in po-directories force: diff --git a/gettext-tools/Makefile.am b/gettext-tools/Makefile.am index 075b7c9a2..6cabe30ee 100644 --- a/gettext-tools/Makefile.am +++ b/gettext-tools/Makefile.am @@ -178,6 +178,6 @@ distdir2: programs-for-distdir maintainer-update-po: $(top_builddir)/config.status $(SHELL) ./config.status --recheck - $(SHELL) ./config.status po/Makefile + $(SHELL) ./config.status po/Makefile.in po-directories cd po && $(MAKE) update-po cd examples && $(MAKE) maintainer-update-po diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac index 6a523aa24..62c4a0e9d 100644 --- a/gettext-tools/configure.ac +++ b/gettext-tools/configure.ac @@ -642,7 +642,7 @@ AC_CONFIG_FILES([src/user-email:src/user-email.sh.in]) AC_CONFIG_FILES([libgettextpo/Makefile]) AC_CONFIG_FILES([libgettextpo/exported.sh]) -AC_CONFIG_FILES([po/Makefile]) +AC_CONFIG_FILES([po/Makefile.in]) AC_CONFIG_FILES([projects/Makefile]) diff --git a/gettext-tools/doc/gettext.texi b/gettext-tools/doc/gettext.texi index 6be7e556e..680c7309d 100644 --- a/gettext-tools/doc/gettext.texi +++ b/gettext-tools/doc/gettext.texi @@ -2952,10 +2952,10 @@ but if there is other code between the comment and the translatable string, the comment no longer applies. Note: The string @code{TRANSLATORS:} is a convention, enabled by the -@code{Makefile.in} file that is part of a package's build system. +@code{Makefile.in.in} file that is part of a package's build system. It is not enabled by default in @code{xgettext}. If you are using @code{xgettext} -without the @code{Makefile.in} infrastructure, +without the @code{Makefile.in.in} infrastructure, you will need to pass the option @code{--add-comments=TRANSLATORS:} yourself. @node c-format Flag @@ -8704,12 +8704,12 @@ possible to specify @code{xgettext} options through the @node po/Rules-* @subsection Extending @file{Makefile} in @file{po/} -@cindex @file{Makefile.in} extensions +@cindex @file{Makefile.in.in} extensions All files called @file{Rules-*} in the @file{po/} directory get appended to the @file{po/Makefile} when it is created. They present an opportunity to add rules for special PO files to the Makefile, without needing to mess -with @file{po/Makefile.in}. +with @file{po/Makefile.in.in}. @cindex quotation marks @vindex LANGUAGE@r{, environment variable} @@ -8785,12 +8785,14 @@ The @code{AC_OUTPUT} directive, at the end of your @file{configure.ac} file, needs to be modified in two ways: @example -AC_OUTPUT([@var{existing configuration files} po/Makefile], +AC_OUTPUT([@var{existing configuration files} po/Makefile.in], [@var{existing additional actions}]) @end example The modification to the first argument to @code{AC_OUTPUT} asks for substitution in the @file{po/} directory. +Note the @samp{.in} suffix used for @file{po/} only. This is because +the distributed file is really @file{po/Makefile.in.in}. @end enumerate @@ -9478,7 +9480,7 @@ undiscovered due to this constellation. There are basically three ways to deal with generated files in the context of a version controlled repository, such as @file{configure} generated from @file{configure.ac}, @code{@var{parser}.c} generated -from @code{@var{parser}.y}, or @code{po/Makefile.in} autoinstalled +from @code{@var{parser}.y}, or @code{po/Makefile.in.in} autoinstalled by @code{gettextize} or @code{autopoint}. @enumerate @@ -10236,7 +10238,7 @@ variable in @file{po/Makevars} (@pxref{po/Makevars}) should be adjusted to match the @code{xgettext} options for that particular programming language. If the package uses more than one programming language with @code{gettext} support, it becomes necessary to change the POT file construction rule -in @file{po/Makefile.in}. It is recommended to make one @code{xgettext} +in @file{po/Makefile.in.in}. It is recommended to make one @code{xgettext} invocation per programming language, each with the options appropriate for that language, and to combine the resulting files using @code{msgcat}. @end itemize diff --git a/gettext-tools/doc/gettextize.texi b/gettext-tools/doc/gettextize.texi index 90167c776..5646471bc 100644 --- a/gettext-tools/doc/gettextize.texi +++ b/gettext-tools/doc/gettextize.texi @@ -112,10 +112,10 @@ packages that use the Automake option @samp{gnits}: @item A @file{po/} directory is created for eventually holding all translation files, but initially only containing the file -@file{po/Makefile.in} from the GNU @code{gettext} distribution -and a few auxiliary +@file{po/Makefile.in.in} from the GNU @code{gettext} distribution +(beware the double @samp{.in} in the file name) and a few auxiliary files. If the @file{po/} directory already exists, it will be preserved -along with the files it contains, and only @file{Makefile.in} and +along with the files it contains, and only @file{Makefile.in.in} and the auxiliary files will be overwritten. If @samp{--po-dir} has been specified, this holds for every directory diff --git a/gettext-tools/examples/README b/gettext-tools/examples/README index 946dbe56b..ec14a2842 100644 --- a/gettext-tools/examples/README +++ b/gettext-tools/examples/README @@ -56,16 +56,16 @@ Makefile types: Example Binary catalog format Makefile type - hello-c .gmo Makefile.in - hello-c-gnome2 .gmo Makefile.in - hello-c-gnome3 .gmo Makefile.in - hello-c++ .gmo Makefile.in - hello-c++20 .gmo Makefile.in - hello-c++-kde .gmo Makefile.in - hello-c++-gnome2 .gmo Makefile.in - hello-c++-gnome3 .gmo Makefile.in - hello-objc .gmo Makefile.in - hello-objc-gnome2 .gmo Makefile.in + hello-c .gmo Makefile.in.in + hello-c-gnome2 .gmo Makefile.in.in + hello-c-gnome3 .gmo Makefile.in.in + hello-c++ .gmo Makefile.in.in + hello-c++20 .gmo Makefile.in.in + hello-c++-kde .gmo Makefile.in.in + hello-c++-gnome2 .gmo Makefile.in.in + hello-c++-gnome3 .gmo Makefile.in.in + hello-objc .gmo Makefile.in.in + hello-objc-gnome2 .gmo Makefile.in.in hello-c++-wxwidgets .gmo Makefile.am hello-sh .gmo Makefile.am hello-python .gmo Makefile.am diff --git a/gettext-tools/examples/hello-c++-gnome2/autoclean.sh b/gettext-tools/examples/hello-c++-gnome2/autoclean.sh index b01089086..9b8332fb2 100755 --- a/gettext-tools/examples/hello-c++-gnome2/autoclean.sh +++ b/gettext-tools/examples/hello-c++-gnome2/autoclean.sh @@ -21,7 +21,7 @@ rm -f m4/lib-prefix.m4 rm -f m4/nls.m4 rm -f m4/po.m4 rm -f m4/progtest.m4 -rm -f po/Makefile.in +rm -f po/Makefile.in.in rm -f po/remove-potcdate.sed # Generated by aclocal. diff --git a/gettext-tools/examples/hello-c++-kde/autoclean.sh b/gettext-tools/examples/hello-c++-kde/autoclean.sh index 2b3e4d59c..99f538a4a 100755 --- a/gettext-tools/examples/hello-c++-kde/autoclean.sh +++ b/gettext-tools/examples/hello-c++-kde/autoclean.sh @@ -27,7 +27,7 @@ rm -f m4/lib-prefix.m4 rm -f m4/nls.m4 rm -f m4/po.m4 rm -f m4/progtest.m4 -rm -f po/Makefile.in +rm -f po/Makefile.in.in rm -f po/remove-potcdate.sed rm -f admin/config.rpath diff --git a/gettext-tools/examples/hello-c++/autoclean.sh b/gettext-tools/examples/hello-c++/autoclean.sh index 8c4062abf..1838e8d23 100755 --- a/gettext-tools/examples/hello-c++/autoclean.sh +++ b/gettext-tools/examples/hello-c++/autoclean.sh @@ -24,7 +24,7 @@ rm -f m4/lib-prefix.m4 rm -f m4/nls.m4 rm -f m4/po.m4 rm -f m4/progtest.m4 -rm -f po/Makefile.in +rm -f po/Makefile.in.in rm -f po/remove-potcdate.sed # Generated by aclocal. diff --git a/gettext-tools/examples/hello-c++20/autoclean.sh b/gettext-tools/examples/hello-c++20/autoclean.sh index 8c4062abf..1838e8d23 100755 --- a/gettext-tools/examples/hello-c++20/autoclean.sh +++ b/gettext-tools/examples/hello-c++20/autoclean.sh @@ -24,7 +24,7 @@ rm -f m4/lib-prefix.m4 rm -f m4/nls.m4 rm -f m4/po.m4 rm -f m4/progtest.m4 -rm -f po/Makefile.in +rm -f po/Makefile.in.in rm -f po/remove-potcdate.sed # Generated by aclocal. diff --git a/gettext-tools/examples/hello-c-gnome2/autoclean.sh b/gettext-tools/examples/hello-c-gnome2/autoclean.sh index b01089086..9b8332fb2 100755 --- a/gettext-tools/examples/hello-c-gnome2/autoclean.sh +++ b/gettext-tools/examples/hello-c-gnome2/autoclean.sh @@ -21,7 +21,7 @@ rm -f m4/lib-prefix.m4 rm -f m4/nls.m4 rm -f m4/po.m4 rm -f m4/progtest.m4 -rm -f po/Makefile.in +rm -f po/Makefile.in.in rm -f po/remove-potcdate.sed # Generated by aclocal. diff --git a/gettext-tools/examples/hello-c-gnome3/autoclean.sh b/gettext-tools/examples/hello-c-gnome3/autoclean.sh index 769c4a6cf..5a41da459 100755 --- a/gettext-tools/examples/hello-c-gnome3/autoclean.sh +++ b/gettext-tools/examples/hello-c-gnome3/autoclean.sh @@ -24,7 +24,7 @@ rm -f m4/lib-prefix.m4 rm -f m4/nls.m4 rm -f m4/po.m4 rm -f m4/progtest.m4 -rm -f po/Makefile.in +rm -f po/Makefile.in.in rm -f po/remove-potcdate.sed # Generated by aclocal. diff --git a/gettext-tools/examples/hello-c/autoclean.sh b/gettext-tools/examples/hello-c/autoclean.sh index 8c4062abf..1838e8d23 100755 --- a/gettext-tools/examples/hello-c/autoclean.sh +++ b/gettext-tools/examples/hello-c/autoclean.sh @@ -24,7 +24,7 @@ rm -f m4/lib-prefix.m4 rm -f m4/nls.m4 rm -f m4/po.m4 rm -f m4/progtest.m4 -rm -f po/Makefile.in +rm -f po/Makefile.in.in rm -f po/remove-potcdate.sed # Generated by aclocal. diff --git a/gettext-tools/examples/hello-objc-gnome2/autoclean.sh b/gettext-tools/examples/hello-objc-gnome2/autoclean.sh index b01089086..9b8332fb2 100755 --- a/gettext-tools/examples/hello-objc-gnome2/autoclean.sh +++ b/gettext-tools/examples/hello-objc-gnome2/autoclean.sh @@ -21,7 +21,7 @@ rm -f m4/lib-prefix.m4 rm -f m4/nls.m4 rm -f m4/po.m4 rm -f m4/progtest.m4 -rm -f po/Makefile.in +rm -f po/Makefile.in.in rm -f po/remove-potcdate.sed # Generated by aclocal. diff --git a/gettext-tools/examples/hello-objc/autoclean.sh b/gettext-tools/examples/hello-objc/autoclean.sh index 8c4062abf..1838e8d23 100755 --- a/gettext-tools/examples/hello-objc/autoclean.sh +++ b/gettext-tools/examples/hello-objc/autoclean.sh @@ -24,7 +24,7 @@ rm -f m4/lib-prefix.m4 rm -f m4/nls.m4 rm -f m4/po.m4 rm -f m4/progtest.m4 -rm -f po/Makefile.in +rm -f po/Makefile.in.in rm -f po/remove-potcdate.sed # Generated by aclocal. diff --git a/gettext-tools/misc/autopoint.in b/gettext-tools/misc/autopoint.in index 004bb8033..133a71540 100644 --- a/gettext-tools/misc/autopoint.in +++ b/gettext-tools/misc/autopoint.in @@ -463,13 +463,12 @@ fi # Check in which directory or directories the po/* infrastructure belongs. configfiles=`"$func_trace" AC_CONFIG_FILES "$configure_in"` -# PO directories have a Makefile generated from Makefile.in. +# PO directories have a Makefile.in generated from Makefile.in.in. # Treat a directory as a PO directory if and only if it has a # POTFILES.in file. This allows packages to have multiple PO # directories under different names or in different locations. -sed_remove_Makefile='s,/Makefile$,,' -podirs=`for f in $configfiles; do case "$f" in */Makefile) echo $f;; esac; done | sed -e "$sed_remove_Makefile"` -podirs=`for d in $podirs; do if test -r $d/POTFILES.in; then echo $d; fi; done` +sed_remove_Makefile_in='s,/Makefile\.in$,,' +podirs=`for f in $configfiles; do case "$f" in */Makefile.in) echo $f;; esac; done | sed -e "$sed_remove_Makefile_in"` if test -z "$podirs"; then # If we cannot get the list of PO directories from configure.ac, assume the # common default. diff --git a/gettext-tools/misc/gettextize.in b/gettext-tools/misc/gettextize.in index 8c852dcfa..e3e9440a2 100644 --- a/gettext-tools/misc/gettextize.in +++ b/gettext-tools/misc/gettextize.in @@ -359,9 +359,6 @@ if test $force -eq 0; then func_fatal_error "intl/ subdirectory exists: use option -f if you really want to delete it." fi for podir in $podirs; do - if test -f "$podir/Makefile.in"; then - func_fatal_error "$podir/Makefile.in exists: use option -f if you really want to delete it." - fi if test -f "$podir/Makefile.in.in"; then func_fatal_error "$podir/Makefile.in.in exists: use option -f if you really want to delete it." fi @@ -718,14 +715,14 @@ fi cd po for podir in $podirs; do $do_changelog && func_poChangeLog_init - for file in Makefile.in; do + for file in Makefile.in.in; do same=no if test -f "$srcdir/$podir/$file"; then if cmp -s $file "$srcdir/$podir/$file"; then same=yes fi else - added_acoutput="$added_acoutput $podir/Makefile" + added_acoutput="$added_acoutput $podir/Makefile.in" fi if $do_changelog && test $same = no; then if test -f "$srcdir/$podir/$file"; then @@ -737,18 +734,9 @@ for podir in $podirs; do func_backup "$podir/$file" func_linkorcopy $file "$gettext_datadir/po/$file" "$podir/$file" done - for file in Makefile.in.in; do - if test -f "$srcdir/$podir/$file"; then - if $do_changelog; then - func_poChangeLog_add_entry " * $file: Remove file." - fi - func_backup "$podir/$file" - rm -f "$srcdir/$podir/$file" - fi - done for file in *; do case $file in - Makefile.in | Makefile.in.in) + Makefile.in.in) # Already handled above. ;; Makevars.template) @@ -825,7 +813,7 @@ m4filelist=' po.m4 progtest.m4' # All sorts of bugs could occur if the configure file was remade with the wrong -# version of gettext.m4 et al. (because then the configure and the po/Makefile.in +# version of gettext.m4 et al. (because then the configure and the po/Makefile.in.in # don't fit together). It is therefore important that the package carries the # right versions of gettext.m4 et al. with it. if test -f "$srcdir/Makefile.am"; then diff --git a/gettext-tools/tests/autopoint-2 b/gettext-tools/tests/autopoint-2 index c82a14289..1b41efa14 100755 --- a/gettext-tools/tests/autopoint-2 +++ b/gettext-tools/tests/autopoint-2 @@ -30,7 +30,7 @@ AM_GNU_GETTEXT([external]) AM_GNU_GETTEXT_VERSION([$ARCHIVE_VERSION]) AC_CONFIG_FILES([Makefile]) -AC_CONFIG_FILES([po/Makefile.in]) dnl if $ARCHIVE_VERSION > 0.23: po/Makefile +AC_CONFIG_FILES([po/Makefile.in]) AC_OUTPUT EOF @@ -43,7 +43,6 @@ test -d po || Exit 1 test -d build-aux || Exit 1 test -f m4/po.m4 || Exit 1 -# if $ARCHIVE_VERSION > 0.23: po/Makefile.in test -f po/Makefile.in.in || Exit 1 test -f build-aux/config.rpath || Exit 1 @@ -59,7 +58,7 @@ AM_GNU_GETTEXT AM_GNU_GETTEXT_VERSION([$ARCHIVE_VERSION]) AC_CONFIG_FILES([Makefile]) -AC_CONFIG_FILES([po/Makefile.in]) dnl if $ARCHIVE_VERSION > 0.23: po/Makefile +AC_CONFIG_FILES([po/Makefile.in]) AC_OUTPUT EOF @@ -111,7 +110,7 @@ AC_CONFIG_MACRO_DIR([gettext-m4]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_FILES([Makefile]) -AC_CONFIG_FILES([po/Makefile.in]) dnl if $ARCHIVE_VERSION > 0.23: po/Makefile +AC_CONFIG_FILES([po/Makefile.in]) AC_OUTPUT EOF @@ -124,7 +123,6 @@ test -d gettext-m4 || Exit 1 test -d po || Exit 1 test -f gettext-m4/po.m4 || Exit 1 -# if $ARCHIVE_VERSION > 0.23: po/Makefile.in test -f po/Makefile.in.in || Exit 1 rm -fr gettext-m4 po ABOUT-NLS config.rpath @@ -140,7 +138,7 @@ AM_GNU_GETTEXT([external], [need-formatstring-macros]) AM_GNU_GETTEXT_VERSION([$ARCHIVE_VERSION]) AC_CONFIG_FILES([Makefile]) -AC_CONFIG_FILES([po/Makefile.in]) dnl if $ARCHIVE_VERSION > 0.23: po/Makefile +AC_CONFIG_FILES([po/Makefile.in]) AC_OUTPUT EOF @@ -152,7 +150,6 @@ test -d m4 || Exit 1 test -d po || Exit 1 test -f m4/po.m4 || Exit 1 -# if $ARCHIVE_VERSION > 0.23: po/Makefile.in test -f po/Makefile.in.in || Exit 1 rm -fr m4 po ABOUT-NLS config.rpath @@ -173,7 +170,7 @@ AM_GNU_GETTEXT([external]) AM_GNU_GETTEXT_VERSION([$ARCHIVE_VERSION]) AC_CONFIG_FILES([Makefile]) -AC_CONFIG_FILES([po/Makefile.in]) dnl if $ARCHIVE_VERSION > 0.23: po/Makefile +AC_CONFIG_FILES([po/Makefile.in]) AC_OUTPUT EOF @@ -185,7 +182,6 @@ test -d m4 || Exit 1 test -d po || Exit 1 test -f m4/po.m4 || Exit 1 -# if $ARCHIVE_VERSION > 0.23: po/Makefile.in test -f po/Makefile.in.in || Exit 1 rm -fr m4 po ABOUT-NLS config.rpath diff --git a/gettext-tools/tests/autopoint-3 b/gettext-tools/tests/autopoint-3 index 58f27a263..af2e17fd9 100755 --- a/gettext-tools/tests/autopoint-3 +++ b/gettext-tools/tests/autopoint-3 @@ -57,7 +57,7 @@ AM_GNU_GETTEXT_VERSION([$ARCHIVE_VERSION]) dnl AC_CONFIG_HEADERS([config.h]) AC_CONFIG_FILES([Makefile]) -AC_CONFIG_FILES([po/Makefile.in]) dnl if $ARCHIVE_VERSION > 0.23: po/Makefile +AC_CONFIG_FILES([po/Makefile.in]) AC_OUTPUT EOF @@ -97,7 +97,6 @@ test -d m4 || Exit 1 test -d po || Exit 1 test -f m4/po.m4 || Exit 1 -# if $ARCHIVE_VERSION > 0.23: po/Makefile.in test -f po/Makefile.in.in || Exit 1 cp -p po/Makevars.template po/Makevars