Fix typo last entry

[deliverable/binutils-gdb.git] / sim / Makefile.in

diff --git a/sim/Makefile.in b/sim/Makefile.in
index 1e53780fd5de8ab69f2dba1c945ade0678bd24c0..fdbcdedeb7bb6b2b3da89e4953f651b98e0ae687 100644 (file)
--- a/sim/Makefile.in
+++ b/sim/Makefile.in
@@ -73,6 +73,10 @@ CC_FOR_BUILD = $(CC)
 # @target_makefile_frag@
 ###
 
+# Name of the ChangeLog file.
+ChangeLog = ChangeLog
+
+
 RUNTEST = `if [ -f $${srcdir}/../dejagnu/runtest ] ; then \
                echo $${srcdir}/../dejagnu/runtest ; else echo runtest; \
           fi`
@@ -81,6 +85,8 @@ RUNTESTFLAGS=
 FLAGS_TO_PASS = \
        "prefix=$(prefix)" \
        "exec_prefix=$(exec_prefix)" \
+       "bindir=$(bindir)" \
+       "mandir=$(mandir)" \
        "against=$(against)" \
        "AR=$(AR)" \
        "AR_FLAGS=$(AR_FLAGS)" \
@@ -124,7 +130,7 @@ all:
                if [ "$$dir" = "." ]; then \
                        true; \
                elif [ -d $$dir ]; then \
-                       (cd $$dir; $(MAKE) $(FLAGS_TO_PASS)); \
+                       (cd $$dir; $(MAKE) $(FLAGS_TO_PASS)) || exit 1; \
                else true; fi; \
        done
 
@@ -134,7 +140,7 @@ clean mostlyclean:
                if [ "$$dir" = "." ]; then \
                        true; \
                elif [ -d $$dir ]; then \
-                       (cd $$dir; $(MAKE) $(FLAGS_TO_PASS) $@); \
+                       (cd $$dir; $(MAKE) $(FLAGS_TO_PASS) $@) || exit 1; \
                else true; fi; \
        done
 
@@ -144,7 +150,7 @@ distclean maintainer-clean realclean:
                if [ "$$dir" = "." ]; then \
                        true; \
                elif [ -d $$dir ]; then \
-                       (cd $$dir; $(MAKE) $(FLAGS_TO_PASS) $@); \
+                       (cd $$dir; $(MAKE) $(FLAGS_TO_PASS) $@) || exit 1; \
                else true; fi; \
        done
        rm -f Makefile config.cache config.log config.status
@@ -155,7 +161,7 @@ install:
                if [ "$$dir" = "." ]; then \
                        true; \
                elif [ -d $$dir ]; then \
-                       (cd $$dir; $(MAKE) $(FLAGS_TO_PASS) install); \
+                       (cd $$dir; $(MAKE) $(FLAGS_TO_PASS) install) || exit 1; \
                else true; fi; \
        done
 
@@ -207,29 +213,33 @@ config.status: configure
 autoconf-common autoheader-common:
        for d in * ; \
        do \
-           if [ -d $$d -a -f $$d/configure.in ] ; \
+           if [ -d $$d -a -f $$d/configure.ac ] ; \
            then \
                 echo "Running autoconf in $$d ..." ; \
-                (cd $$d && autoconf) ; \
+                (cd $$d && autoconf --force) ; \
                 if [ $@ = autoheader-common ] ; \
                 then \
                   echo "Running autoheader in $$d ..." ; \
-                  (cd $$d && autoheader) ; \
+                  (cd $$d && autoheader --force) ; \
                 fi ; \
            fi ; \
        done
 
 autoconf-changelog autoheader-changelog:
-       id="`id | sed -e 's/^[^(]*(\([^)]*\).*$$/\1/'`" ; \
-       name=`grep "^$$id:" /etc/passwd | cut -f 5 -d ':'` ; \
-       host="`hostname`" ; \
-       date="`date | sed 's/ [^ ]* \([0-9]*\)$$/ \1/'`" ; \
+       id=$(ID) ; \
+       test x$$id = x && id="`id | sed -e 's/^[^(]*(\([^)]*\).*$$/\1/'`" ; \
+       name=$(NAME) ; \
+       test x$$name = x && name=`grep "^$$id:" /etc/passwd | cut -f 5 -d ':'` ; \
+       host=$(HOST) ; \
+       test x$$host = x && host="`hostname`" ; \
+       date=$(DATE) ; \
+       test x$$date = x && date="`date +%Y-%m-%d`" ; \
        echo "$$date $$name $$id@$$host" ; \
        for d in * ; \
        do \
-           if [ -d $$d -a -f $$d/configure.in ] ; \
+           if [ -d $$d -a -f $$d/configure.ac ] ; \
            then \
-                echo "Creating new-ChangeLog in $$d ..." ; \
+                echo "Creating new-$(ChangeLog) in $$d ..." ; \
                 ( echo "$$date  $$name  <$$id@$$host>" ; \
                   echo "" ; \
                   echo "       * configure: Regenerated to track ../common/aclocal.m4 changes." ; \
@@ -238,17 +248,17 @@ autoconf-changelog autoheader-changelog:
                     echo "     * config.in: Ditto." ; \
                   fi ; \
                   echo "" ; \
-                  cat $$d/ChangeLog \
-                ) > $$d/new-ChangeLog ; \
+                  cat $$d/$(ChangeLog) \
+                ) > $$d/new-$(ChangeLog) ; \
            fi ; \
        done
 
 autoconf-install autoheader-install:
        for d in * ; \
        do \
-           if [ -d $$d -a -f $$d/configure.in ] ; \
+           if [ -d $$d -a -f $$d/configure.ac ] ; \
            then \
-                echo "Moving $$d/new-ChangeLog to $$d/ChangeLog ..." ; \
-                mv $$d/new-ChangeLog $$d/ChangeLog ; \
+                echo "Moving $$d/new-$(ChangeLog) to $$d/$(ChangeLog) ..." ; \
+                mv $$d/new-$(ChangeLog) $$d/$(ChangeLog) ; \
            fi ; \
        done