Make-lang.in (ada.install-common, [...]): Prepend $(DESTDIR) to the destination direc...

* Make-lang.in (ada.install-common, ada.uninstall):
Prepend $(DESTDIR) to the destination directory in all
(un)installation commands.
* Makefile.in (install-gnatlib): Ditto.  Rewrite $(LN)
commands to support DESTDIR with "ln" as well as with
"ln -s".

From-SVN: r62026

diff --git a/gcc/ada/Make-lang.in b/gcc/ada/Make-lang.in
index b9fdd1cff2269951f2622020f0fb5bd4b86d77c7..eee97a8b177122e57663f9919b3e80b4c901790c 100644 (file)
--- a/gcc/ada/Make-lang.in
+++ b/gcc/ada/Make-lang.in
@@ -261,6 +261,7 @@ ada.install-normal:
 # likewise for gnatf, gnatchop, and gnatlink, gnatkr, gnatmake, gnatcmd,
 # gnatprep, gnatbl, gnatls, gnatxref, gnatfind
 ada.install-common:
+       $(MKDIR) $(DESTDIR)$(bindir)
        -if [ -f gnat1$(exeext) ] ; \
         then \
          if [ -f gnatbind-cross$(exeext) ] ; \
@@ -270,7 +271,7 @@ ada.install-common:
            if [ -d $(DESTDIR)$(tooldir)/bin/. ] ; then \
              rm -f $(DESTDIR)$(tooldir)/bin/gnatbind$(exeext); \
              $(INSTALL_PROGRAM) gnatbind-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatbind$(exeext); \
-            fi; \
+           fi; \
          else \
            $(RM) $(DESTDIR)$(bindir)/gnatbind$(exeext); \
            $(INSTALL_PROGRAM) gnatbind$(exeext) $(DESTDIR)$(bindir)/gnatbind$(exeext); \
@@ -285,7 +286,7 @@ ada.install-common:
            if [ -d $(DESTDIR)$(tooldir)/bin/. ] ; then \
               rm -f $(DESTDIR)$(tooldir)/bin/gnatbl$(exeext); \
               $(INSTALL_PROGRAM) gnatbl-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatbl$(exeext); \
-            fi; \
+           fi; \
          else \
            $(RM) $(DESTDIR)$(bindir)/gnatbl$(exeext); \
            $(INSTALL_PROGRAM) gnatbl$(exeext) $(DESTDIR)$(bindir)/gnatbl$(exeext); \
@@ -309,28 +310,13 @@ ada.install-common:
        -if [ -f gnat1$(exeext) ] ; \
        then \
          if [ -f gnatchop-cross$(shext) ] ; \
-         then \
-           $(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatchop$(shext); \
-           $(INSTALL_PROGRAM) $(srcdir)/ada/gnatchop$(shext) $(DESTDIR)$(bindir)/$(target_alias)-gnatchop$(shext); \
-           if [ -d $(DESTDIR)$(tooldir)/bin/. ] ; then \
-              rm -f $(DESTDIR)$(tooldir)/bin/gnatchop$(shext); \
-              $(INSTALL_PROGRAM) gnatchop$(shext) $(DESTDIR)$(tooldir)/bin/gnatchop$(exeext); \
-            fi; \
-         else \
-           $(RM) $(DESTDIR)$(bindir)/gnatchop$(shext); \
-           $(INSTALL_PROGRAM) $(srcdir)/ada/gnatchop$(shext) $(DESTDIR)$(bindir)/gnatchop$(shext); \
-         fi ; \
-       fi
-       -if [ -f gnat1$(exeext) ] ; \
-       then \
-         if [ -f gnatchop-cross$(exeext) ] ; \
          then \
            $(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatchop$(exeext); \
            $(INSTALL_PROGRAM) gnatchop-cross$(exeext) $(DESTDIR)$(bindir)/$(target_alias)-gnatchop$(exeext); \
            if [ -d $(DESTDIR)$(tooldir)/bin/. ] ; then \
               rm -f $(DESTDIR)$(tooldir)/bin/gnatchop$(exeext); \
               $(INSTALL_PROGRAM) gnatchop-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatchop$(exeext); \
-            fi; \
+           fi; \
          else \
            $(RM) $(DESTDIR)$(bindir)/gnatchop$(exeext); \
            $(INSTALL_PROGRAM) gnatchop$(exeext) $(DESTDIR)$(bindir)/gnatchop$(exeext); \
@@ -345,7 +331,7 @@ ada.install-common:
            if [ -d $(DESTDIR)$(tooldir)/bin/. ] ; then \
               rm -f $(DESTDIR)$(tooldir)/bin/gnat$(exeext); \
               $(INSTALL_PROGRAM) gnatcmd-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnat$(exeext); \
-            fi; \
+           fi; \
          else \
            $(RM) $(DESTDIR)$(bindir)/gnat$(exeext); \
            $(INSTALL_PROGRAM) gnatcmd$(exeext) $(DESTDIR)$(bindir)/gnat$(exeext); \
@@ -360,7 +346,7 @@ ada.install-common:
            if [ -d $(DESTDIR)$(tooldir)/bin/. ] ; then \
               rm -f $(DESTDIR)$(tooldir)/bin/gnatkr$(exeext); \
               $(INSTALL_PROGRAM) gnatkr-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatkr$(exeext); \
-            fi; \
+           fi; \
          else \
            $(RM) $(DESTDIR)$(bindir)/gnatkr$(exeext); \
            $(INSTALL_PROGRAM) gnatkr$(exeext) $(DESTDIR)$(bindir)/gnatkr$(exeext); \
@@ -375,7 +361,7 @@ ada.install-common:
            if [ -d $(DESTDIR)$(tooldir)/bin/. ] ; then \
               rm -f $(DESTDIR)$(tooldir)/bin/gnatlink$(exeext); \
               $(INSTALL_PROGRAM) gnatlink-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatlink$(exeext); \
-            fi; \
+           fi; \
          else \
            $(RM) $(DESTDIR)$(bindir)/gnatlink$(exeext); \
            $(INSTALL_PROGRAM) gnatlink$(exeext) $(DESTDIR)$(bindir)/gnatlink$(exeext); \
@@ -390,7 +376,7 @@ ada.install-common:
            if [ -d $(DESTDIR)$(tooldir)/bin/. ] ; then \
               rm -f $(DESTDIR)$(tooldir)/bin/gnatls$(exeext); \
               $(INSTALL_PROGRAM) gnatls-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatls$(exeext); \
-            fi; \
+           fi; \
          else \
            $(RM) $(DESTDIR)$(bindir)/gnatls$(exeext); \
            $(INSTALL_PROGRAM) gnatls$(exeext) $(DESTDIR)$(bindir)/gnatls$(exeext); \
@@ -405,7 +391,7 @@ ada.install-common:
            if [ -d $(DESTDIR)$(tooldir)/bin/. ] ; then \
               rm -f $(DESTDIR)$(tooldir)/bin/gnatmake$(exeext); \
               $(INSTALL_PROGRAM) gnatmake-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatmake$(exeext); \
-            fi; \
+           fi; \
          else \
            $(RM) $(DESTDIR)$(bindir)/gnatmake$(exeext); \
            $(INSTALL_PROGRAM) gnatmake$(exeext) $(DESTDIR)$(bindir)/gnatmake$(exeext); \
@@ -431,7 +417,7 @@ ada.install-common:
            if [ -d $(DESTDIR)$(tooldir)/bin/. ] ; then \
               rm -f $(DESTDIR)$(tooldir)/bin/gnatprep$(exeext); \
               $(INSTALL_PROGRAM) gnatprep-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatprep$(exeext); \
-            fi; \
+           fi; \
          else \
            $(RM) $(DESTDIR)$(bindir)/gnatprep$(exeext); \
            $(INSTALL_PROGRAM) gnatprep$(exeext) $(DESTDIR)$(bindir)/gnatprep$(exeext); \
@@ -446,7 +432,7 @@ ada.install-common:
            if [ -d $(DESTDIR)$(tooldir)/bin/. ] ; then \
               rm -f $(DESTDIR)$(tooldir)/bin/gnatpsta$(exeext); \
               $(INSTALL_PROGRAM) gnatpsta-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatpsta$(exeext); \
-            fi; \
+           fi; \
          else \
            $(RM) $(DESTDIR)$(bindir)/gnatpsta$(exeext); \
            $(INSTALL_PROGRAM) gnatpsta$(exeext) $(DESTDIR)$(bindir)/gnatpsta$(exeext); \
@@ -461,12 +447,12 @@ ada.install-common:
            if [ -d $(DESTDIR)$(tooldir)/bin/. ] ; then \
               rm -f $(DESTDIR)$(tooldir)/bin/gnatpsys$(exeext); \
               $(INSTALL_PROGRAM) gnatpsys-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatpsys$(exeext); \
-            fi; \
+           fi; \
          else \
            $(RM) $(DESTDIR)$(bindir)/gnatpsys$(exeext); \
            $(INSTALL_PROGRAM) gnatpsys$(exeext) $(DESTDIR)$(bindir)/gnatpsys$(exeext); \
          fi ; \
-    fi
+       fi
        -if [ -f gnat1$(exeext) ] ; \
        then \
          if [ -f gnatxref-cross$(exeext) ] ; \
@@ -477,7 +463,7 @@ ada.install-common:
            $(RM) $(DESTDIR)$(bindir)/gnatxref$(exeext); \
            $(INSTALL_PROGRAM) gnatxref$(exeext) $(DESTDIR)$(bindir)/gnatxref$(exeext); \
          fi ; \
-    fi
+       fi
        -if [ -f gnat1$(exeext) ] ; \
        then \
          if [ -f gnatfind-cross$(exeext) ] ; \
@@ -494,11 +480,6 @@ ada.install-common:
 #
        -if [ -f gnat1$(exeext) ] ; \
        then \
-         if [ -f gnatchop$(exeext) ] ; \
-         then \
-           $(RM) $(DESTDIR)$(bindir)/gnatchop$(exeext); \
-           $(INSTALL_PROGRAM) gnatchop$(exeext) $(DESTDIR)$(bindir)/gnatchop$(exeext); \
-         fi ; \
          if [ -f gnatlbr$(exeext) ] ; \
          then \
            $(RM) $(DESTDIR)$(bindir)/gnatlbr$(exeext); \
@@ -510,8 +491,11 @@ ada.install-common:
 #
        -if [ -f gnat1$(exeext) ] ; \
        then \
+         if [ -f gnatdll$(exeext) ] ; \
+         then \
            $(RM) $(DESTDIR)$(bindir)/gnatdll$(exeext); \
            $(INSTALL_PROGRAM) gnatdll$(exeext) $(DESTDIR)$(bindir)/gnatdll$(exeext); \
+         fi ; \
        fi
        -if [ -f gnat1$(exeext) ] ; \
        then \
@@ -538,9 +522,11 @@ ada.uninstall:
        -$(RM) $(DESTDIR)$(bindir)/gnatbind$(exeext)
        -$(RM) $(DESTDIR)$(bindir)/gnatbl$(exeext)
        -$(RM) $(DESTDIR)$(bindir)/gnatchop$(exeext)
-       -$(RM) $(DESTDIR)$(bindir)/gnatcmd$(exeext)
+       -$(RM) $(DESTDIR)$(bindir)/gnat$(exeext)
        -$(RM) $(DESTDIR)$(bindir)/gnatdll$(exeext)
+       -$(RM) $(DESTDIR)$(bindir)/gnatfind$(exeext)
        -$(RM) $(DESTDIR)$(bindir)/gnatkr$(exeext)
+       -$(RM) $(DESTDIR)$(bindir)/gnatlbr$(exeext)
        -$(RM) $(DESTDIR)$(bindir)/gnatlink$(exeext)
        -$(RM) $(DESTDIR)$(bindir)/gnatls$(exeext)
        -$(RM) $(DESTDIR)$(bindir)/gnatmake$(exeext)
@@ -548,11 +534,15 @@ ada.uninstall:
        -$(RM) $(DESTDIR)$(bindir)/gnatprep$(exeext)
        -$(RM) $(DESTDIR)$(bindir)/gnatpsta$(exeext)
        -$(RM) $(DESTDIR)$(bindir)/gnatpsys$(exeext)
+       -$(RM) $(DESTDIR)$(bindir)/gnatxref$(exeext)
        -$(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatbind$(exeext)
        -$(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatbl$(exeext)
        -$(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatchop$(exeext)
-       -$(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatcmd$(exeext)
+       -$(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnat$(exeext)
+       -$(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatdll$(exeext)
+       -$(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatfind$(exeext)
        -$(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatkr(exeext)
+       -$(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatlbr$(exeext)
        -$(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatlink$(exeext)
        -$(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatls$(exeext)
        -$(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatmake$(exeext)
@@ -560,12 +550,15 @@ ada.uninstall:
        -$(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatprep$(exeext)
        -$(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatpsta$(exeext)
        -$(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatpsys$(exeext)
+       -$(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatxref$(exeext)
        -$(RM) $(DESTDIR)$(tooldir)/bin/gnatbind$(exeext)
        -$(RM) $(DESTDIR)$(tooldir)/bin/gnatbl$(exeext)
        -$(RM) $(DESTDIR)$(tooldir)/bin/gnatchop$(exeext)
-       -$(RM) $(DESTDIR)$(tooldir)/bin/gnatcmd$(exeext)
+       -$(RM) $(DESTDIR)$(tooldir)/bin/gnat$(exeext)
        -$(RM) $(DESTDIR)$(tooldir)/bin/gnatdll$(exeext)
+       -$(RM) $(DESTDIR)$(tooldir)/bin/gnatfind$(exeext)
        -$(RM) $(DESTDIR)$(tooldir)/bin/gnatkr$(exeext)
+       -$(RM) $(DESTDIR)$(tooldir)/bin/gnatlbr$(exeext)
        -$(RM) $(DESTDIR)$(tooldir)/bin/gnatlink$(exeext)
        -$(RM) $(DESTDIR)$(tooldir)/bin/gnatls$(exeext)
        -$(RM) $(DESTDIR)$(tooldir)/bin/gnatmake$(exeext)
@@ -573,8 +566,7 @@ ada.uninstall:
        -$(RM) $(DESTDIR)$(tooldir)/bin/gnatprep$(exeext)
        -$(RM) $(DESTDIR)$(tooldir)/bin/gnatpsta$(exeext)
        -$(RM) $(DESTDIR)$(tooldir)/bin/gnatpsys$(exeext)
-# Gnatlbr and Gnatchop are only used on VMS
-       -$(RM) $(DESTDIR)$(bindir)/gnatlbr$(exeext) $(DESTDIR)$(bindir)/gnatchop$(exeext)
+       -$(RM) $(DESTDIR)$(tooldir)/bin/gnatxref$(exeext)
 \f
 # Clean hooks:
 # A lot of the ancillary files are deleted by the main makefile.