From f5b10cfbc31555b50d9dbdfaddbd1877cfb78a3b Mon Sep 17 00:00:00 2001
From: amodra <amodra>
Date: Thu, 4 Jun 2009 06:56:41 +0000
Subject: [PATCH] 	* 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(-)

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 21eff9e0ff..7b8e100d5f 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,9 @@
+2009-06-04  Alan Modra  <amodra@bigpond.net.au>
+
+	* 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  <nickc@redhat.com>
 
 	* po/nl.po: Updated Dutch translation.
diff --git a/opcodes/Makefile.am b/opcodes/Makefile.am
index 665bdd411a..d2a76c7736 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 b1eb9d421d..9dc3c55c23 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 df8bc1eec1..56403a9781 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/$/ \\/
-- 
2.11.0