diff options
| author | Jeremy Huddleston <jeremyhu@apple.com> | 2012-02-12 19:01:43 -0800 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@apple.com> | 2012-02-12 19:14:37 -0800 |
| commit | d2cce0abba0fa0143f49026442c8cab5ed721625 (patch) | |
| tree | b78e07c087891dec09702de8c5df9f3de5b40800 | |
| parent | f180e043f55531933bedfa6e0ff36a00a9ec07f3 (diff) | |
nls: Use LC_CTYPE=C for sed magic
Stricter versions of sed can trip up if the input does not match
LC_CTYPE
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
| -rw-r--r-- | cpprules.in | 2 | ||||
| -rw-r--r-- | nls/Makefile.am | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/cpprules.in b/cpprules.in index fca0ab39..e1296c69 100644 --- a/cpprules.in +++ b/cpprules.in @@ -2,7 +2,7 @@ # Rules for generating files using the C pre-processor # (Replaces CppFileTarget from Imake) -SED = sed +SED = LC_CTYPE=C sed SUFFIXES += .pre diff --git a/nls/Makefile.am b/nls/Makefile.am index 7dc43088..0eced4cd 100644 --- a/nls/Makefile.am +++ b/nls/Makefile.am @@ -20,19 +20,19 @@ include $(top_srcdir)/cpprules.in locale.alias: locale.alias.pre $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $(srcdir)/locale.alias.pre | $(CPP_SED_MAGIC) > locale.alias.l1 - sed -e '/^[^#][^ ]*:/s/://' -e '/^[^#].*[ ].*:/d' \ + $(SED) -e '/^[^#][^ ]*:/s/://' -e '/^[^#].*[ ].*:/d' \ < locale.alias.l1 > locale.alias.l2 cat locale.alias.l2 locale.alias.l1 > locale.alias compose.dir: compose.dir.pre $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $(srcdir)/compose.dir.pre | $(CPP_SED_MAGIC) > compose.dir.l1 - sed -e '/^[^#][^ ]*:/s/://' -e '/^[^#].*[ ].*:/d' \ + $(SED) -e '/^[^#][^ ]*:/s/://' -e '/^[^#].*[ ].*:/d' \ < compose.dir.l1 > compose.dir.l2 cat compose.dir.l2 compose.dir.l1 > compose.dir locale.dir: locale.dir.pre $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $(srcdir)/locale.dir.pre | $(CPP_SED_MAGIC) > locale.dir.l1 - sed -e '/^[^#][^ ]*:/s/://' -e '/^[^#].*[ ].*:/d' \ + $(SED) -e '/^[^#][^ ]*:/s/://' -e '/^[^#].*[ ].*:/d' \ < locale.dir.l1 > locale.dir.l2 cat locale.dir.l2 locale.dir.l1 > locale.dir |