summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2006-06-19 10:44:37 +0000
committerBruno Haible <bruno@clisp.org>2009-06-23 12:13:24 +0200
commit093a4e8135e1b2af3b90d4e2aa38030bcd28c7e6 (patch)
tree62229b57ed29a4e9e2093dc1877b10e8a7d33499
parent60a1819d717086063a7e0e9521934d5904544e5f (diff)
downloadexternal_gettext-093a4e8135e1b2af3b90d4e2aa38030bcd28c7e6.zip
external_gettext-093a4e8135e1b2af3b90d4e2aa38030bcd28c7e6.tar.gz
external_gettext-093a4e8135e1b2af3b90d4e2aa38030bcd28c7e6.tar.bz2
Fix sh quoting inside backquote.
-rw-r--r--gettext-runtime/m4/ChangeLog6
-rw-r--r--gettext-runtime/m4/po.m46
2 files changed, 9 insertions, 3 deletions
diff --git a/gettext-runtime/m4/ChangeLog b/gettext-runtime/m4/ChangeLog
index 8c6e11f..f2cf990 100644
--- a/gettext-runtime/m4/ChangeLog
+++ b/gettext-runtime/m4/ChangeLog
@@ -1,3 +1,9 @@
+2006-06-17 Bruno Haible <bruno@clisp.org>
+
+ * po.m4 (AM_POSTPROCESS_PO_MAKEFILE): Remove double-quotes around
+ backquoted expression in assignment.
+ Fixes a problem with NetBSD /bin/sh.
+
2006-06-04 Bruno Haible <bruno@clisp.org>
* inttypes-h.m4: Renamed from inttypes.m4.
diff --git a/gettext-runtime/m4/po.m4 b/gettext-runtime/m4/po.m4
index c1ac760..00133ef 100644
--- a/gettext-runtime/m4/po.m4
+++ b/gettext-runtime/m4/po.m4
@@ -1,4 +1,4 @@
-# po.m4 serial 12 (gettext-0.15)
+# po.m4 serial 13 (gettext-0.15)
dnl Copyright (C) 1995-2006 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -285,7 +285,7 @@ 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'`"
+ 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))
@@ -304,7 +304,7 @@ changequote([,])dnl
POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
else
# Set ALL_LINGUAS to the value of the Makefile variable LINGUAS.
- sed_x_LINGUAS="`$gt_echo \"$sed_x_variable\" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'`"
+ sed_x_LINGUAS=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'`
ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"`
fi
# Hide the ALL_LINGUAS assigment from automake < 1.5.