From 67a648f17aaf9902891ec61c8025b98612dbbab4 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Thu, 4 Jun 2009 06:57:56 +0000 Subject: * dep-in.sed: Don't use \n in replacement part of s command. * Makefile.am (DEP1): LC_ALL for uniq. * Makefile.in: Regenerate. --- opcodes/ChangeLog | 6 ++++++ opcodes/Makefile.am | 3 ++- opcodes/Makefile.in | 3 ++- opcodes/dep-in.sed | 3 ++- 4 files changed, 12 insertions(+), 3 deletions(-) (limited to 'opcodes') diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index 21eff9e0ff6..7b8e100d5f5 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,9 @@ +2009-06-04 Alan Modra + + * dep-in.sed: Don't use \n in replacement part of s command. + * Makefile.am (DEP1): LC_ALL for uniq. + * Makefile.in: Regenerate. + 2009-06-02 Nick Clifton * po/nl.po: Updated Dutch translation. diff --git a/opcodes/Makefile.am b/opcodes/Makefile.am index 665bdd411a5..d2a76c7736f 100644 --- a/opcodes/Makefile.am +++ b/opcodes/Makefile.am @@ -654,7 +654,8 @@ DEP1: $(CFILES) for f in $?; do \ $(MKDEP) $(INCLUDES) $(CFLAGS) $$f > DEPA; \ sed -n -e '1s/\.o: .*/.lo: \\/p' -e q < DEPA >> DEP2; \ - sed -e '1s/.*: //' -f dep.sed < DEPA | LC_ALL=C sort | uniq | \ + sed -e '1s/.*: //' -f dep.sed < DEPA | \ + LC_ALL=C sort | LC_ALL=C uniq | \ sed -e 's/^[AB]/ /' -e '$$s/ \\$$//' >> DEP2; \ done rm -f DEPA diff --git a/opcodes/Makefile.in b/opcodes/Makefile.in index b1eb9d421db..9dc3c55c239 100644 --- a/opcodes/Makefile.in +++ b/opcodes/Makefile.in @@ -1219,7 +1219,8 @@ DEP1: $(CFILES) for f in $?; do \ $(MKDEP) $(INCLUDES) $(CFLAGS) $$f > DEPA; \ sed -n -e '1s/\.o: .*/.lo: \\/p' -e q < DEPA >> DEP2; \ - sed -e '1s/.*: //' -f dep.sed < DEPA | LC_ALL=C sort | uniq | \ + sed -e '1s/.*: //' -f dep.sed < DEPA | \ + LC_ALL=C sort | LC_ALL=C uniq | \ sed -e 's/^[AB]/ /' -e '$$s/ \\$$//' >> DEP2; \ done rm -f DEPA diff --git a/opcodes/dep-in.sed b/opcodes/dep-in.sed index df8bc1eec11..56403a97810 100644 --- a/opcodes/dep-in.sed +++ b/opcodes/dep-in.sed @@ -15,5 +15,6 @@ s! \.\./intl/libintl\.h!!g s/ *$// s/ */ /g s/^ */A/ -s/ / \\\nB/g +s/ / \\\ +B/g $s/$/ \\/ -- cgit v1.2.1