* Makefile.am (check-DEJAGNU): Export r.

	(.dep1): Use $(INCLUDES) rather than $(ALL_CFLAGS).
	* Makefile.in: Rebuild.

	* nlmheader.y: Use VERSIONK rather than VERSION.

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 792a6b0..f8d6032 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,5 +1,11 @@
 Tue Aug  5 00:01:41 1997  Ian Lance Taylor  <ian@cygnus.com>
 
+       * Makefile.am (check-DEJAGNU): Export r.
+       (.dep1): Use $(INCLUDES) rather than $(ALL_CFLAGS).
+       * Makefile.in: Rebuild.
+
+       * nlmheader.y: Use VERSIONK rather than VERSION.
+
        * Makefile.am (STRIP_PROG): Change from strip.new to strip-new.
        (NM_PROG): Change from nm.new to nm-new.
        (TOOL_PROGS, install-exec-local): Adjust accordingly.

diff --git a/binutils/Makefile.am b/binutils/Makefile.am
index 252d486..b5fcd5f 100644 (file)
--- a/binutils/Makefile.am
+++ b/binutils/Makefile.am
@@ -114,6 +114,7 @@ CC_FOR_TARGET = ` \
 
 check-DEJAGNU: site.exp
        srcdir=`cd $(srcdir) && pwd`; export srcdir; \
+       r=`pwd`; export r; \
        EXPECT=$(EXPECT); export EXPECT; \
        if [ -f $(top_builddir)/../expect/expect ]; then \
          TCL_LIBRARY=`cd $(top_srcdir)/../tcl/library && pwd`; \
@@ -253,7 +254,7 @@ windres_LDADD = $(BFDLIB) $(LIBIBERTY) @LEXLIB@
 .dep1: $(CFILES) $(GENERATED_CFILES)
        rm -f .dep2
        echo '# DO NOT DELETE THIS LINE -- mkdep uses it.' > .dep2
-       $(DEP) -f .dep2 $(ALL_CFLAGS) $?
+       $(DEP) -f .dep2 $(INCLUDES) $?
        $(SHELL) $(srcdir)/../move-if-change .dep2 .dep1
 
 dep.sed: dep-in.sed config.status

diff --git a/binutils/Makefile.in b/binutils/Makefile.in
index 0e0baac..47c7702 100644 (file)
--- a/binutils/Makefile.in
+++ b/binutils/Makefile.in
@@ -863,6 +863,7 @@ maintainer-clean
 
 check-DEJAGNU: site.exp
        srcdir=`cd $(srcdir) && pwd`; export srcdir; \
+       r=`pwd`; export r; \
        EXPECT=$(EXPECT); export EXPECT; \
        if [ -f $(top_builddir)/../expect/expect ]; then \
          TCL_LIBRARY=`cd $(top_srcdir)/../tcl/library && pwd`; \
@@ -959,7 +960,7 @@ nlmconv.o: nlmconv.c $(INCDIR)/coff/sym.h $(INCDIR)/coff/ecoff.h
 .dep1: $(CFILES) $(GENERATED_CFILES)
        rm -f .dep2
        echo '# DO NOT DELETE THIS LINE -- mkdep uses it.' > .dep2
-       $(DEP) -f .dep2 $(ALL_CFLAGS) $?
+       $(DEP) -f .dep2 $(INCLUDES) $?
        $(SHELL) $(srcdir)/../move-if-change .dep2 .dep1
 
 dep.sed: dep-in.sed config.status