diff options
| author | Alan Modra <amodra@gmail.com> | 2000-07-01 01:41:09 +0000 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2000-07-01 01:41:09 +0000 |
| commit | 0bdaf48bac96b318feed22ef57035b06133fcf2f (patch) | |
| tree | e8928b9d365d067eba6e374fd61c32266caf24eb /binutils | |
| parent | 9b443040f82ecf46cfec9d18b9d1ed2d487c53d5 (diff) | |
| download | gdb-0bdaf48bac96b318feed22ef57035b06133fcf2f.zip gdb-0bdaf48bac96b318feed22ef57035b06133fcf2f.tar.gz gdb-0bdaf48bac96b318feed22ef57035b06133fcf2f.tar.bz2 | |
Fix 2000-06-22. grep after running dep.sed
Diffstat (limited to 'binutils')
| -rw-r--r-- | binutils/ChangeLog | 6 | ||||
| -rw-r--r-- | binutils/Makefile.am | 9 | ||||
| -rw-r--r-- | binutils/Makefile.in | 9 |
3 files changed, 16 insertions, 8 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 44ee5dc..717e27b 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,9 @@ +2000-07-01 Alan Modra <alan@linuxcare.com.au> + + * Makefile.am (DEP): Fix 2000-06-22. grep after running dep.sed + (CLEANFILES): Add DEPA. + * Makefile.in: Regenerate. + 2000-06-27 Alan Modra <alan@linuxcare.com.au> * ar.c: Revert incorrect 2000-06-25 patch. diff --git a/binutils/Makefile.am b/binutils/Makefile.am index c3b09cd..9c3139a 100644 --- a/binutils/Makefile.am +++ b/binutils/Makefile.am @@ -287,11 +287,12 @@ DISTCLEANFILES = stamp-under sysinfo underscore.c sysroff.c sysroff.h \ DEP: dep.sed $(CFILES) $(HFILES) $(GENERATED_CFILES) $(GENERATED_HFILES) config.h rm -f DEP1 $(MAKE) MKDEP="$(MKDEP)" DEP1 - if grep ' /' DEP1 > /dev/null 2> /dev/null; then \ + sed -f dep.sed < DEP1 > DEPA + echo '# IF YOU PUT ANYTHING HERE IT WILL GO AWAY' >> DEPA + if grep ' /' DEPA > /dev/null 2> /dev/null; then \ echo 'make DEP failed!'; exit 1; \ else \ - sed -f dep.sed < DEP1 > $@; \ - echo '# IF YOU PUT ANYTHING HERE IT WILL GO AWAY' >> $@; \ + mv -f DEPA $@; \ fi DEP1: $(CFILES) $(GENERATED_CFILES) @@ -346,7 +347,7 @@ MOSTLYCLEANFILES = sysinfo $(DEMANGLER_NAME).1 binutils.log binutils.sum \ mostlyclean-local: -rm -rf tmpdir -CLEANFILES = dep.sed DEP DEP1 DEP2 +CLEANFILES = dep.sed DEP DEPA DEP1 DEP2 .PHONY: install-exec-local diff --git a/binutils/Makefile.in b/binutils/Makefile.in index 7e51ccc..5f11469 100644 --- a/binutils/Makefile.in +++ b/binutils/Makefile.in @@ -300,7 +300,7 @@ MOSTLYCLEANFILES = sysinfo $(DEMANGLER_NAME).1 binutils.log binutils.sum \ abcdefgh* -CLEANFILES = dep.sed DEP DEP1 DEP2 +CLEANFILES = dep.sed DEP DEPA DEP1 DEP2 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs CONFIG_HEADER = config.h @@ -1150,11 +1150,12 @@ diststuff: $(DISTSTUFF) info DEP: dep.sed $(CFILES) $(HFILES) $(GENERATED_CFILES) $(GENERATED_HFILES) config.h rm -f DEP1 $(MAKE) MKDEP="$(MKDEP)" DEP1 - if grep ' /' DEP1 > /dev/null 2> /dev/null; then \ + sed -f dep.sed < DEP1 > DEPA + echo '# IF YOU PUT ANYTHING HERE IT WILL GO AWAY' >> DEPA + if grep ' /' DEPA > /dev/null 2> /dev/null; then \ echo 'make DEP failed!'; exit 1; \ else \ - sed -f dep.sed < DEP1 > $@; \ - echo '# IF YOU PUT ANYTHING HERE IT WILL GO AWAY' >> $@; \ + mv -f DEPA $@; \ fi DEP1: $(CFILES) $(GENERATED_CFILES) |