* Makefile.am: Add ACLOCAL_AMFLAGS.

	* Makefile.in: Regenerate.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 5ea8cac..5912caf 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-14  Steve Ellcey  <sje@cup.hp.com>
+
+       * Makefile.am: Add ACLOCAL_AMFLAGS.
+       * Makefile.in: Regenerate.
+
 2007-04-12  Bob Wilson  <bob.wilson@acm.org>
        
        * emulparams/elf32xtensa.sh (OTHER_SECTIONS): KEEP property sections.

diff --git a/ld/Makefile.am b/ld/Makefile.am
index d911f0c..b6ac5a5 100644 (file)
--- a/ld/Makefile.am
+++ b/ld/Makefile.am
@@ -1,6 +1,7 @@
 ## Process this file with automake to generate Makefile.in
 
 AUTOMAKE_OPTIONS = cygnus dejagnu
+ACLOCAL_AMFLAGS = -I ..
 
 SUBDIRS = po
 

diff --git a/ld/Makefile.in b/ld/Makefile.in
index de5f6c1..28400cc 100644 (file)
--- a/ld/Makefile.in
+++ b/ld/Makefile.in
@@ -266,6 +266,7 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 use_sysroot = @use_sysroot@
 AUTOMAKE_OPTIONS = cygnus dejagnu
+ACLOCAL_AMFLAGS = -I ..
 SUBDIRS = po
 tooldir = $(exec_prefix)/$(target_alias)
 YFLAGS = -d
@@ -721,15 +722,15 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
        @for dep in $?; do \
          case '$(am__configure_deps)' in \
            *$$dep*) \
-             echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
-             cd $(srcdir) && $(AUTOMAKE) --foreign  \
+             echo ' cd $(srcdir) && $(AUTOMAKE) --cygnus '; \
+             cd $(srcdir) && $(AUTOMAKE) --cygnus  \
                && exit 0; \
              exit 1;; \
          esac; \
        done; \
-       echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  Makefile'; \
+       echo ' cd $(top_srcdir) && $(AUTOMAKE) --cygnus  Makefile'; \
        cd $(top_srcdir) && \
-         $(AUTOMAKE) --foreign  Makefile
+         $(AUTOMAKE) --cygnus  Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
        @case '$?' in \