diff options
| author | Alan Modra <amodra@bigpond.net.au> | 2009-06-04 06:57:56 +0000 |
|---|---|---|
| committer | Alan Modra <amodra@bigpond.net.au> | 2009-06-04 06:57:56 +0000 |
| commit | 02e1a129e216391b77fbf1c7e85b923da87cce20 (patch) | |
| tree | 931bd37aa34a47a4831856c453505fec3ff51313 /gprof | |
| parent | 3807b79c79114e7209b100dba1bd6c4bc30370a2 (diff) | |
| download | binutils-redhat-02e1a129e216391b77fbf1c7e85b923da87cce20.tar.gz | |
* dep-in.sed: Don't use \n in replacement part of s command.
* Makefile.am (DEP1): LC_ALL for uniq.
* Makefile.in: Regenerate.
Diffstat (limited to 'gprof')
| -rw-r--r-- | gprof/ChangeLog | 6 | ||||
| -rw-r--r-- | gprof/Makefile.am | 3 | ||||
| -rw-r--r-- | gprof/Makefile.in | 3 | ||||
| -rw-r--r-- | gprof/dep-in.sed | 3 |
4 files changed, 12 insertions, 3 deletions
diff --git a/gprof/ChangeLog b/gprof/ChangeLog index 0b7e5db0b9..56c478a30f 100644 --- a/gprof/ChangeLog +++ b/gprof/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-05-26 Nick Clifton <nickc@redhat.com> * po/id.po: Updated Indonesian translation. diff --git a/gprof/Makefile.am b/gprof/Makefile.am index a2a42177a2..12d794beed 100644 --- a/gprof/Makefile.am +++ b/gprof/Makefile.am @@ -194,7 +194,8 @@ DEP1: $(gprof_SOURCES) for f in $?; do \ $(MKDEP) $(INCLUDES) $(CFLAGS) $$f > DEPA; \ sed -n -e '1s/: .*/: \\/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/gprof/Makefile.in b/gprof/Makefile.in index a9dc9201e4..e711f53367 100644 --- a/gprof/Makefile.in +++ b/gprof/Makefile.in @@ -966,7 +966,8 @@ DEP1: $(gprof_SOURCES) for f in $?; do \ $(MKDEP) $(INCLUDES) $(CFLAGS) $$f > DEPA; \ sed -n -e '1s/: .*/: \\/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/gprof/dep-in.sed b/gprof/dep-in.sed index 04612289e0..4823f1e382 100644 --- a/gprof/dep-in.sed +++ b/gprof/dep-in.sed @@ -15,5 +15,6 @@ s! \.\./intl/libintl\.h!!g s/ *$// s/ */ /g s/^ */A/ -s/ / \\\nB/g +s/ / \\\ +B/g $s/$/ \\/ |