* Makefile.am (install-exec-local): Split into two ...

	(install-exec-bindir,install-exec-tooldir): New rules.
	* Makefile.in: Regenerate.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index b08110953500ed29b66ca48effe58ffc620a53b8..7cb676bc8b908f7e86e0adbe374e36fd3126826f 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+Fri Jul 24 19:58:59 1998  Doug Evans  <devans@canuck.cygnus.com>
+
+       * Makefile.am (install-exec-local): Split into two ...
+       (install-exec-bindir,install-exec-tooldir): New rules.
+       * Makefile.in: Regenerate.
+
 Fri Jul 24 16:31:49 1998  Ian Lance Taylor  <ian@cygnus.com>
 
        * Makefile.am (install-exec-local): Don't remove the file before

diff --git a/gas/Makefile.am b/gas/Makefile.am
index 441064550dddac9afd93849b96559289a6203a63..82cf213bd9c4569fab31adc3ce41471a847acaf0 100644 (file)
--- a/gas/Makefile.am
+++ b/gas/Makefile.am
@@ -549,20 +549,28 @@ MOSTLYCLEANFILES = $(STAGESTUFF) core stamp-mk.com \
 CLEANFILES = dep.sed .tcdep .objdep .dep2 .dep1 .depa .dep .depdir
 
 .PHONY: install-exec-local install-data-local
+.PHONY: install-exec-bindir install-exec-tooldir
 
-install-exec-local: $(noinst_PROGRAMS)
-       $(mkinstalldirs) $(bindir) $(tooldir)/bin
+install-exec-local: install-exec-bindir install-exec-tooldir
+
+install-exec-bindir: $(noinst_PROGRAMS)
+       $(mkinstalldirs) $(bindir)
        @list='$(noinst_PROGRAMS)'; for p in $$list; do \
          if test -f $$p; then \
            echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed -e 's/$(EXEEXT)$$//' -e 's/-new//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
            $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed -e 's/$(EXEEXT)$$//' -e 's/-new//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
          else :; fi; \
        done
+
+install-exec-tooldir: $(noinst_PROGRAMS)
+       $(mkinstalldirs) $(tooldir)/bin
        n=`echo as | sed '$(transform)'`; \
        if [ "$(bindir)/$$n$(EXEEXT)" != "$(tooldir)/bin/as$(EXEEXT)" ]; then \
          rm -f $(tooldir)/bin/as$(EXEEXT); \
          ln $(bindir)/$$n$(EXEEXT) $(tooldir)/bin/as$(EXEEXT) >/dev/null 2>/dev/null \
            || $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) as-new$(EXEEXT) $(tooldir)/bin/as$(EXEEXT); \
+       else \
+         true ; \
        fi
 
 # These exist for maintenance purposes.

diff --git a/gas/Makefile.in b/gas/Makefile.in
index ddb6ae075dc38bfdf8cb4805e51a13752e0def30..9cab930afe08b4183a55f48bb3b1ca05cc2b415b 100644 (file)
--- a/gas/Makefile.in
+++ b/gas/Makefile.in
@@ -1757,20 +1757,28 @@ cgen.o: cgen.c cgen.h cgen-opc.h subsegs.h \
        $(srcdir)/../opcodes/$(CGEN_CPU_PREFIX)-opc.h
 
 .PHONY: install-exec-local install-data-local
+.PHONY: install-exec-bindir install-exec-tooldir
 
-install-exec-local: $(noinst_PROGRAMS)
-       $(mkinstalldirs) $(bindir) $(tooldir)/bin
+install-exec-local: install-exec-bindir install-exec-tooldir
+
+install-exec-bindir: $(noinst_PROGRAMS)
+       $(mkinstalldirs) $(bindir)
        @list='$(noinst_PROGRAMS)'; for p in $$list; do \
          if test -f $$p; then \
            echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed -e 's/$(EXEEXT)$$//' -e 's/-new//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
            $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed -e 's/$(EXEEXT)$$//' -e 's/-new//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
          else :; fi; \
        done
+
+install-exec-tooldir: $(noinst_PROGRAMS)
+       $(mkinstalldirs) $(tooldir)/bin
        n=`echo as | sed '$(transform)'`; \
        if [ "$(bindir)/$$n$(EXEEXT)" != "$(tooldir)/bin/as$(EXEEXT)" ]; then \
          rm -f $(tooldir)/bin/as$(EXEEXT); \
          ln $(bindir)/$$n$(EXEEXT) $(tooldir)/bin/as$(EXEEXT) >/dev/null 2>/dev/null \
            || $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) as-new$(EXEEXT) $(tooldir)/bin/as$(EXEEXT); \
+       else \
+         true ; \
        fi
 
 # These exist for maintenance purposes.