Make-lang.in (DEMANGLER_INSTALL_NAME, [...]): New macros.

	* Make-lang.in (DEMANGLER_INSTALL_NAME, DEMANGLER_CROSS_NAME): New
	macros.
	(c++.install-common): Install c++filt properly as native or as cross
	variant.
	(c++.uninstall): Add c++filt.

From-SVN: r18000

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index bd3003fd2d1d3dc051e5751c5ff5f0e46f8be0d9..6da997c54323496b0a2e7c78a84d1834bd1255b4 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,11 @@
+Sat Feb 14 11:50:51 1998  Manfred Hollstein  <manfred@s-direktnet.de>
+
+       * Make-lang.in (DEMANGLER_INSTALL_NAME, DEMANGLER_CROSS_NAME): New 
+       macros.
+       (c++.install-common): Install c++filt properly as native or as cross
+       variant.
+       (c++.uninstall): Add c++filt.
+
 Fri Feb 13 14:55:37 1998  Jason Merrill  <jason@yorick.cygnus.com>
 
        * call.c (standard_conversion): Fix multi-level ptr conversions.

diff --git a/gcc/cp/Make-lang.in b/gcc/cp/Make-lang.in
index 2c202ce18009b0aa59bf4de2883cbbb4f1f70a14..a9e4e1ca87e4f73487bd1017ee730696b1cd71b6 100644 (file)
--- a/gcc/cp/Make-lang.in
+++ b/gcc/cp/Make-lang.in
@@ -45,10 +45,12 @@ CXX_FLAGS_TO_PASS = \
 # Actual names to use when installing a native compiler.
 CXX_INSTALL_NAME = `t='$(program_transform_name)'; echo c++ | sed $$t`
 GXX_INSTALL_NAME = `t='$(program_transform_name)'; echo g++ | sed $$t`
+DEMANGLER_INSTALL_NAME = `t='$(program_transform_name)'; echo c++filt | sed $$t`
 
 # Actual names to use when installing a cross-compiler.
 CXX_CROSS_NAME = `t='$(program_transform_cross_name)'; echo c++ | sed $$t`
 GXX_CROSS_NAME = `t='$(program_transform_cross_name)'; echo g++ | sed $$t`
+DEMANGLER_CROSS_NAME = `t='$(program_transform_cross_name)'; echo c++filt | sed $$t`
 
 # The name to use for the demangler program.
 DEMANGLER_PROG = c++filt$(exeext)
@@ -225,8 +227,17 @@ c++.install-common:
            rm -f $(bindir)/$(CXX_INSTALL_NAME)$(exeext); \
            $(LN) $(bindir)/$(GXX_INSTALL_NAME)$(exeext) $(bindir)/$(CXX_INSTALL_NAME)$(exeext); \
          fi ; \
-         rm -f $(bindir)/$(DEMANGLER_PROG) ; \
-         $(INSTALL_PROGRAM) $(DEMANGLER_PROG) $(bindir)/$(DEMANGLER_PROG) ; \
+         if [ x$(DEMANGLER_PROG) != x ] && [ -x "$(DEMANGLER_PROG)" ]; then \
+           if [ -f g++-cross$(exeext) ] ; then \
+             rm -f $(bindir)/$(DEMANGLER_CROSS_NAME)$(exeext); \
+             $(INSTALL_PROGRAM) $(DEMANGLER_PROG) $(bindir)/$(DEMANGLER_CROSS_NAME)$(exeext); \
+             chmod a+x $(bindir)/$(DEMANGLER_CROSS_NAME)$(exeext); \
+           else \
+             rm -f $(bindir)/$(DEMANGLER_INSTALL_NAME)$(exeext); \
+             $(INSTALL_PROGRAM) $(DEMANGLER_PROG) $(bindir)/$(DEMANGLER_INSTALL_NAME)$(exeext); \
+             chmod a+x $(bindir)/$(DEMANGLER_INSTALL_NAME)$(exeext); \
+           fi ; \
+         fi ; \
        fi
 
 c++.install-info:
@@ -249,6 +260,8 @@ c++.uninstall:
        -rm -rf $(bindir)/$(CXX_CROSS_NAME)$(exeext)
        -rm -rf $(bindir)/$(GXX_INSTALL_NAME)$(exeext)
        -rm -rf $(bindir)/$(GXX_CROSS_NAME)$(exeext)
+       -rm -rf $(bindir)/$(DEMANGLER_INSTALL_NAME)$(exeext)
+       -rm -rf $(bindir)/$(DEMANGLER_CROSS_NAME)$(exeext)
        -rm -rf $(mandir)/$(GXX_INSTALL_NAME)$(manext)
        -rm -rf $(mandir)/$(GXX_CROSS_NAME)$(manext)
 #\f