protoize/unprotoize are target dependent, so give them target dependent names.

	* Makefile.in (PROTOIZE_INSTALL_NAME, UNPROTOIZE_INSTALL_NAME,
	PROTOIZE_CROSS_NAME, UNPROTOIZE_CROSS_NAME): New variables.
	(install-common): Use them.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@20661 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c539488..ae517fc 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,9 @@
 Mon Jun 22 12:01:48 1998  Jim Wilson  <wilson@cygnus.com>
 
+       * Makefile.in (PROTOIZE_INSTALL_NAME, UNPROTOIZE_INSTALL_NAME,
+       PROTOIZE_CROSS_NAME, UNPROTOIZE_CROSS_NAME): New variables.
+       (install-common): Use them.
+
        * gcse.c (add_label_notes): New function.
        (pre_insert_insn): Call it.
        * unroll.c (unroll_loop): Look for insns with a REG_LABEL note, and

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 64da030..325d540 100644 (file)
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -450,9 +450,13 @@ HOST_DOPRINT=$(DOPRINT)
 
 # Actual name to use when installing a native compiler.
 GCC_INSTALL_NAME = `t='$(program_transform_name)'; echo gcc | sed -e $$t`
+PROTOIZE_INSTALL_NAME = `t='$(program_transform_name)'; echo protoize | sed -e $$t`
+UNPROTOIZE_INSTALL_NAME = `t='$(program_transform_name)'; echo unprotoize | sed -e $$t`
 
 # Actual name to use when installing a cross-compiler.
 GCC_CROSS_NAME = `t='$(program_transform_cross_name)'; echo gcc | sed -e $$t`
+PROTOIZE_CROSS_NAME = `t='$(program_transform_cross_name)'; echo protoize | sed -e $$t`
+UNPROTOIZE_CROSS_NAME = `t='$(program_transform_cross_name)'; echo unprotoize | sed -e $$t`
 
 # Choose the real default target.
 ALL=all.internal
@@ -2321,10 +2325,17 @@ install-common: native installdirs $(EXTRA_PARTS) lang.install-common
 # Install protoize if it was compiled.
        -if [ -f protoize$(exeext) ]; \
        then \
-           rm -f $(bindir)/protoize$(exeext); \
-           $(INSTALL_PROGRAM) protoize$(exeext) $(bindir)/protoize$(exeext); \
-           rm -f $(bindir)/unprotoize$(exeext); \
-           $(INSTALL_PROGRAM) unprotoize$(exeext) $(bindir)/unprotoize$(exeext); \
+           if [ -f gcc-cross$(exeext) ] ; then \
+               rm -f $(bindir)/$(PROTOIZE_CROSS_NAME)$(exeext); \
+               $(INSTALL_PROGRAM) protoize$(exeext) $(bindir)/$(PROTOIZE_CROSS_NAME)$(exeext); \
+               rm -f $(bindir)/$(UNPROTOIZE_CROSS_NAME)$(exeext); \
+               $(INSTALL_PROGRAM) unprotoize$(exeext) $(bindir)/$(UNPROTOIZE_CROSS_NAME)$(exeext); \
+           else \
+               rm -f $(bindir)/$(PROTOIZE_INSTALL_NAME)$(exeext); \
+               $(INSTALL_PROGRAM) protoize$(exeext) $(bindir)/$(PROTOIZE_INSTALL_NAME)$(exeext); \
+               rm -f $(bindir)/$(UNPROTOIZE_INSTALL_NAME)$(exeext); \
+               $(INSTALL_PROGRAM) unprotoize$(exeext) $(bindir)/$(UNPROTOIZE_INSTALL_NAME)$(exeext); \
+           fi ; \
            rm -f $(libsubdir)/SYSCALLS.c.X; \
            $(INSTALL_DATA) SYSCALLS.c.X $(libsubdir)/SYSCALLS.c.X; \
            chmod a-x $(libsubdir)/SYSCALLS.c.X; \