From: Bruno Haible <bruno@clisp.org>
Date: Sun, 4 Dec 2016 12:17:59 +0000 (+0100)
Subject: Fix an error message when gettextize if run with option -n.
X-Git-Tag: v0.20~493
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a9e96bf3d24e8288902185e62af2223f902f98b0;p=thirdparty%2Fgettext.git

Fix an error message when gettextize if run with option -n.

* gettext-tools/misc/gettextize.in: Consider the Makevars.template file at the
location where it is installed, not in $srcdir.
---

diff --git a/gettext-tools/misc/gettextize.in b/gettext-tools/misc/gettextize.in
index 63d5bb718..056461973 100644
--- a/gettext-tools/misc/gettextize.in
+++ b/gettext-tools/misc/gettextize.in
@@ -758,7 +758,7 @@ for podir in $podirs; do
         func_linkorcopy Makevars.template "$gettext_datadir/po/Makevars.template" "$podir/Makevars.template"
         if test -f "$srcdir/po/Makevars"; then
           LC_ALL=C sed -n -e 's/[ 	]*\([A-Za-z0-9_]*\)[ 	]*=.*/\1/p' < "$srcdir/$podir/Makevars" | LC_ALL=C sort > "$srcdir/$podir/Makevars.tmp1"
-          LC_ALL=C sed -n -e 's/[ 	]*\([A-Za-z0-9_]*\)[ 	]*=.*/\1/p' < "$srcdir/$podir/Makevars.template" | LC_ALL=C sort > "$srcdir/$podir/Makevars.tmp2"
+          LC_ALL=C sed -n -e 's/[ 	]*\([A-Za-z0-9_]*\)[ 	]*=.*/\1/p' < "$gettext_datadir/po/Makevars.template" | LC_ALL=C sort > "$srcdir/$podir/Makevars.tmp2"
           missingvars=`LC_ALL=C comm -13 "$srcdir/$podir/Makevars.tmp1" "$srcdir/$podir/Makevars.tmp2"`
           rm -f "$srcdir/$podir/Makevars.tmp1" "$srcdir/$podir/Makevars.tmp2"
           if test -n "$missingvars"; then