Check dependecies for leading `/' in this dir too.

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index ce7c8f55f4e3c606102e2ca425840a2bf13dcb89..e1fc95b7c2d6dc3621e18003ce37e404a40f4e09 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,9 @@
+2000-06-22  Alan Modra  <alan@linuxcare.com.au>
+
+       * Makefile.am (DEP): grep for leading `/' in DEP1, and fail if we
+       find one.
+       * Makefile.in: Regenerate.
+
 2000-06-20  Alexander Aganichev <AAganichev@hypercom.com>
 
        * ar.c (normalize): Correct pointer comparison when checking for

diff --git a/binutils/Makefile.am b/binutils/Makefile.am
index 837f861330e9d4c431617aaaa41ab2071b5ddcb7..c3b09cd48e8f05895f0dd1a2c42e67bd8cc9321d 100644 (file)
--- a/binutils/Makefile.am
+++ b/binutils/Makefile.am
@@ -287,8 +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
-       sed -f dep.sed < DEP1 > $@
-       echo '# IF YOU PUT ANYTHING HERE IT WILL GO AWAY' >> $@
+       if grep ' /' DEP1 > /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' >> $@; \
+       fi
 
 DEP1: $(CFILES) $(GENERATED_CFILES)
        echo '# DO NOT DELETE THIS LINE -- mkdep uses it.' > DEP2

diff --git a/binutils/Makefile.in b/binutils/Makefile.in
index 0e99f1bb6beb88f146e62ad48db20ea9bd723cc0..7e51ccce7d303d85d898ade5f1390192d8aaed27 100644 (file)
--- a/binutils/Makefile.in
+++ b/binutils/Makefile.in
@@ -414,7 +414,7 @@ configure.in deflex.c defparse.c nlmheader.c rclex.c rcparse.c
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = gtar
+TAR = tar
 GZIP_ENV = --best
 SOURCES = $(nlmconv_SOURCES) $(srconv_SOURCES) $(sysdump_SOURCES) $(coffdump_SOURCES) $(dlltool_SOURCES) $(windres_SOURCES) $(dllwrap_SOURCES) $(size_SOURCES) $(objdump_SOURCES) $(ar_SOURCES) $(strings_SOURCES) $(ranlib_SOURCES) $(objcopy_SOURCES) $(addr2line_SOURCES) $(readelf_SOURCES) $(nm_new_SOURCES) $(strip_new_SOURCES) $(cxxfilt_SOURCES)
 OBJECTS = $(nlmconv_OBJECTS) $(srconv_OBJECTS) $(sysdump_OBJECTS) $(coffdump_OBJECTS) $(dlltool_OBJECTS) $(windres_OBJECTS) $(dllwrap_OBJECTS) $(size_OBJECTS) $(objdump_OBJECTS) $(ar_OBJECTS) $(strings_OBJECTS) $(ranlib_OBJECTS) $(objcopy_OBJECTS) $(addr2line_OBJECTS) $(readelf_OBJECTS) $(nm_new_OBJECTS) $(strip_new_OBJECTS) $(cxxfilt_OBJECTS)
@@ -1150,8 +1150,12 @@ diststuff: $(DISTSTUFF) info
 DEP: dep.sed $(CFILES) $(HFILES) $(GENERATED_CFILES) $(GENERATED_HFILES) config.h
        rm -f DEP1
        $(MAKE) MKDEP="$(MKDEP)" DEP1
-       sed -f dep.sed < DEP1 > $@
-       echo '# IF YOU PUT ANYTHING HERE IT WILL GO AWAY' >> $@
+       if grep ' /' DEP1 > /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' >> $@; \
+       fi
 
 DEP1: $(CFILES) $(GENERATED_CFILES)
        echo '# DO NOT DELETE THIS LINE -- mkdep uses it.' > DEP2