bfd:

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

diff --git a/sim/Makefile.in b/sim/Makefile.in
index 9a044f060432ff0b6970e7c5d28492db2bb78a93..fdbcdedeb7bb6b2b3da89e4953f651b98e0ae687 100644 (file)
--- a/sim/Makefile.in
+++ b/sim/Makefile.in
@@ -85,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)" \
@@ -128,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
 
@@ -138,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
 
@@ -148,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
@@ -159,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
 
@@ -211,14 +213,14 @@ 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
@@ -235,7 +237,7 @@ autoconf-changelog autoheader-changelog:
        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 "$$date  $$name  <$$id@$$host>" ; \
@@ -254,7 +256,7 @@ autoconf-changelog autoheader-changelog:
 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) ; \