From 67e1d6fffde5d9c3c683d0cc72c549e374e6556c Mon Sep 17 00:00:00 2001 From: aj Date: Thu, 9 Jan 2003 08:03:46 +0000 Subject: [PATCH] 2003-01-09 Christian Cornelssen * Make-lang.in (ada.install-info, ada.install-common, ada.uninstall): Prepend $(DESTDIR) to the destination directory in all (un)installation commands. * Makefile.in (install-gnatlib, install-rts): Ditto. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@61078 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ada/ChangeLog | 7 ++ gcc/ada/Make-lang.in | 296 +++++++++++++++++++++++++-------------------------- gcc/ada/Makefile.in | 40 +++---- 3 files changed, 175 insertions(+), 168 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 046347dd235..6b435f5ddd1 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,10 @@ +2003-01-09 Christian Cornelssen + + * Make-lang.in (ada.install-info, ada.install-common, + ada.uninstall): Prepend $(DESTDIR) to the destination + directory in all (un)installation commands. + * Makefile.in (install-gnatlib, install-rts): Ditto. + 2002-12-28 Joseph S. Myers * gnat_rm.texi, gnat_ug.texi: Use @copying. diff --git a/gcc/ada/Make-lang.in b/gcc/ada/Make-lang.in index 4e6d44607d3..c63f95b2e81 100644 --- a/gcc/ada/Make-lang.in +++ b/gcc/ada/Make-lang.in @@ -394,30 +394,30 @@ ada.info: $(srcdir)/ada/gnat_ug_vms.info $(srcdir)/ada/gnat_ug_wnt.info \ $(srcdir)/ada/gnat_rm.info $(srcdir)/ada/gnat-style.info ada.install-info: - -rm -f $(infodir)/gnat_ug_*.info* - -rm -f $(infodir)/gnat_rm.info* - -rm -f $(infodir)/gnat-style.info* + -rm -f $(DESTDIR)$(infodir)/gnat_ug_*.info* + -rm -f $(DESTDIR)$(infodir)/gnat_rm.info* + -rm -f $(DESTDIR)$(infodir)/gnat-style.info* if [ -f $(srcdir)/ada/gnat_ug_unx.info ]; then \ for f in $(srcdir)/ada/gnat_ug_*.info* \ $(srcdir)/ada/gnat_rm.info* \ $(srcdir)/ada/gnat-style.info*; do \ realfile=`echo $$f | sed -e 's|.*/\([^/]*\)$$|\1|'`; \ - $(INSTALL_DATA) $$f $(infodir)/$$realfile; \ + $(INSTALL_DATA) $$f $(DESTDIR)$(infodir)/$$realfile; \ done; \ else true; fi -if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \ - if [ -f $(infodir)/dir ] ; then \ + if [ -f $(DESTDIR)$(infodir)/dir ] ; then \ for f in gnat_ug_vms.info gnat_ug_wnt.info gnat_ug_unx.info \ gnat_ug_vxw.info gnat_rm.info gnat-style.info; do \ - if [ -f $(infodir)/$$f ]; then \ - install-info --dir-file=$(infodir)/dir $(infodir)/$$f; \ + if [ -f $(DESTDIR)$(infodir)/$$f ]; then \ + install-info --dir-file=$(DESTDIR)$(infodir)/dir $(DESTDIR)$(infodir)/$$f; \ else true; fi; \ done; \ else true; fi; \ else true; fi; - -chmod a-x $(infodir)/gnat_ug_vms.info* $(infodir)/gnat_ug_wnt.info* - -chmod a-x $(infodir)/gnat_ug_unx.info* $(infodir)/gnat_ug_vxw.info* - -chmod a-x $(infodir)/gnat_rm.info* $(infodir)/gnat-style.info* + -chmod a-x $(DESTDIR)$(infodir)/gnat_ug_vms.info* $(DESTDIR)$(infodir)/gnat_ug_wnt.info* + -chmod a-x $(DESTDIR)$(infodir)/gnat_ug_unx.info* $(DESTDIR)$(infodir)/gnat_ug_vxw.info* + -chmod a-x $(DESTDIR)$(infodir)/gnat_rm.info* $(DESTDIR)$(infodir)/gnat-style.info* ada/gnat_ug_unx.dvi : $(srcdir)/ada/gnat_ug_unx.texi \ $(srcdir)/doc/include/fdl.texi $(srcdir)/doc/include/gcc-common.texi @@ -469,217 +469,217 @@ ada.install-common: then \ if [ -f gnatbind-cross$(exeext) ] ; \ then \ - $(RM) $(bindir)/$(target_alias)-gnatbind$(exeext); \ - $(INSTALL_PROGRAM) gnatbind-cross$(exeext) $(bindir)/$(target_alias)-gnatbind$(exeext); \ - if [ -d $(tooldir)/bin/. ] ; then \ - rm -f $(tooldir)/bin/gnatbind$(exeext); \ - $(INSTALL_PROGRAM) gnatbind-cross$(exeext) $(tooldir)/bin/gnatbind$(exeext); \ + $(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatbind$(exeext); \ + $(INSTALL_PROGRAM) gnatbind-cross$(exeext) $(DESTDIR)$(bindir)/$(target_alias)-gnatbind$(exeext); \ + if [ -d $(DESTDIR)$(tooldir)/bin/. ] ; then \ + rm -f $(DESTDIR)$(tooldir)/bin/gnatbind$(exeext); \ + $(INSTALL_PROGRAM) gnatbind-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatbind$(exeext); \ fi; \ else \ - $(RM) $(bindir)/gnatbind$(exeext); \ - $(INSTALL_PROGRAM) gnatbind$(exeext) $(bindir)/gnatbind$(exeext); \ + $(RM) $(DESTDIR)$(bindir)/gnatbind$(exeext); \ + $(INSTALL_PROGRAM) gnatbind$(exeext) $(DESTDIR)$(bindir)/gnatbind$(exeext); \ fi ; \ fi -if [ -f gnat1$(exeext) ] ; \ then \ if [ -f gnatbl-cross$(exeext) ] ; \ then \ - $(RM) $(bindir)/$(target_alias)-gnatbl$(exeext); \ - $(INSTALL_PROGRAM) gnatbl-cross$(exeext) $(bindir)/$(target_alias)-gnatbl$(exeext); \ - if [ -d $(tooldir)/bin/. ] ; then \ - rm -f $(tooldir)/bin/gnatbl$(exeext); \ - $(INSTALL_PROGRAM) gnatbl-cross$(exeext) $(tooldir)/bin/gnatbl$(exeext); \ + $(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatbl$(exeext); \ + $(INSTALL_PROGRAM) gnatbl-cross$(exeext) $(DESTDIR)$(bindir)/$(target_alias)-gnatbl$(exeext); \ + if [ -d $(DESTDIR)$(tooldir)/bin/. ] ; then \ + rm -f $(DESTDIR)$(tooldir)/bin/gnatbl$(exeext); \ + $(INSTALL_PROGRAM) gnatbl-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatbl$(exeext); \ fi; \ else \ - $(RM) $(bindir)/gnatbl$(exeext); \ - $(INSTALL_PROGRAM) gnatbl$(exeext) $(bindir)/gnatbl$(exeext); \ + $(RM) $(DESTDIR)$(bindir)/gnatbl$(exeext); \ + $(INSTALL_PROGRAM) gnatbl$(exeext) $(DESTDIR)$(bindir)/gnatbl$(exeext); \ fi ; \ fi -if [ -f gnat1$(exeext) ] ; \ then \ if [ -f gnatchop-cross$(shext) ] ; \ then \ - $(RM) $(bindir)/$(target_alias)-gnatchop$(shext); \ - $(INSTALL_PROGRAM) $(srcdir)/ada/gnatchop$(shext) $(bindir)/$(target_alias)-gnatchop$(shext); \ - if [ -d $(tooldir)/bin/. ] ; then \ - rm -f $(tooldir)/bin/gnatchop$(shext); \ - $(INSTALL_PROGRAM) gnatchop$(shext) $(tooldir)/bin/gnatchop$(exeext); \ + $(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) $(bindir)/gnatchop$(shext); \ - $(INSTALL_PROGRAM) $(srcdir)/ada/gnatchop$(shext) $(bindir)/gnatchop$(shext); \ + $(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) $(bindir)/$(target_alias)-gnatchop$(exeext); \ - $(INSTALL_PROGRAM) gnatchop-cross$(exeext) $(bindir)/$(target_alias)-gnatchop$(exeext); \ - if [ -d $(tooldir)/bin/. ] ; then \ - rm -f $(tooldir)/bin/gnatchop$(exeext); \ - $(INSTALL_PROGRAM) gnatchop-cross$(exeext) $(tooldir)/bin/gnatchop$(exeext); \ + $(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; \ else \ - $(RM) $(bindir)/gnatchop$(exeext); \ - $(INSTALL_PROGRAM) gnatchop$(exeext) $(bindir)/gnatchop$(exeext); \ + $(RM) $(DESTDIR)$(bindir)/gnatchop$(exeext); \ + $(INSTALL_PROGRAM) gnatchop$(exeext) $(DESTDIR)$(bindir)/gnatchop$(exeext); \ fi ; \ fi -if [ -f gnat1$(exeext) ] ; \ then \ if [ -f gnat-cross$(exeext) ] ; \ then \ - $(RM) $(bindir)/$(target_alias)-gnat$(exeext); \ - $(INSTALL_PROGRAM) gnat-cross$(exeext) $(bindir)/$(target_alias)-gnat$(exeext); \ - if [ -d $(tooldir)/bin/. ] ; then \ - rm -f $(tooldir)/bin/gnat$(exeext); \ - $(INSTALL_PROGRAM) gnat-cross$(exeext) $(tooldir)/bin/gnat$(exeext); \ + $(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnat$(exeext); \ + $(INSTALL_PROGRAM) gnat-cross$(exeext) $(DESTDIR)$(bindir)/$(target_alias)-gnat$(exeext); \ + if [ -d $(DESTDIR)$(tooldir)/bin/. ] ; then \ + rm -f $(DESTDIR)$(tooldir)/bin/gnat$(exeext); \ + $(INSTALL_PROGRAM) gnat-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnat$(exeext); \ fi; \ else \ - $(RM) $(bindir)/gnat$(exeext); \ - $(INSTALL_PROGRAM) gnat$(exeext) $(bindir)/gnat$(exeext); \ + $(RM) $(DESTDIR)$(bindir)/gnat$(exeext); \ + $(INSTALL_PROGRAM) gnat$(exeext) $(DESTDIR)$(bindir)/gnat$(exeext); \ fi ; \ fi -if [ -f gnat1$(exeext) ] ; \ then \ if [ -f gnatkr-cross$(exeext) ] ; \ then \ - $(RM) $(bindir)/$(target_alias)-gnatkr$(exeext); \ - $(INSTALL_PROGRAM) gnatkr-cross$(exeext) $(bindir)/$(target_alias)-gnatkr$(exeext); \ - if [ -d $(tooldir)/bin/. ] ; then \ - rm -f $(tooldir)/bin/gnatkr$(exeext); \ - $(INSTALL_PROGRAM) gnatkr-cross$(exeext) $(tooldir)/bin/gnatkr$(exeext); \ + $(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatkr$(exeext); \ + $(INSTALL_PROGRAM) gnatkr-cross$(exeext) $(DESTDIR)$(bindir)/$(target_alias)-gnatkr$(exeext); \ + if [ -d $(DESTDIR)$(tooldir)/bin/. ] ; then \ + rm -f $(DESTDIR)$(tooldir)/bin/gnatkr$(exeext); \ + $(INSTALL_PROGRAM) gnatkr-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatkr$(exeext); \ fi; \ else \ - $(RM) $(bindir)/gnatkr$(exeext); \ - $(INSTALL_PROGRAM) gnatkr$(exeext) $(bindir)/gnatkr$(exeext); \ + $(RM) $(DESTDIR)$(bindir)/gnatkr$(exeext); \ + $(INSTALL_PROGRAM) gnatkr$(exeext) $(DESTDIR)$(bindir)/gnatkr$(exeext); \ fi ; \ fi -if [ -f gnat1$(exeext) ] ; \ then \ if [ -f gnatlink-cross$(exeext) ] ; \ then \ - $(RM) $(bindir)/$(target_alias)-gnatlink$(exeext); \ - $(INSTALL_PROGRAM) gnatlink-cross$(exeext) $(bindir)/$(target_alias)-gnatlink$(exeext); \ - if [ -d $(tooldir)/bin/. ] ; then \ - rm -f $(tooldir)/bin/gnatlink$(exeext); \ - $(INSTALL_PROGRAM) gnatlink-cross$(exeext) $(tooldir)/bin/gnatlink$(exeext); \ + $(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatlink$(exeext); \ + $(INSTALL_PROGRAM) gnatlink-cross$(exeext) $(DESTDIR)$(bindir)/$(target_alias)-gnatlink$(exeext); \ + if [ -d $(DESTDIR)$(tooldir)/bin/. ] ; then \ + rm -f $(DESTDIR)$(tooldir)/bin/gnatlink$(exeext); \ + $(INSTALL_PROGRAM) gnatlink-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatlink$(exeext); \ fi; \ else \ - $(RM) $(bindir)/gnatlink$(exeext); \ - $(INSTALL_PROGRAM) gnatlink$(exeext) $(bindir)/gnatlink$(exeext); \ + $(RM) $(DESTDIR)$(bindir)/gnatlink$(exeext); \ + $(INSTALL_PROGRAM) gnatlink$(exeext) $(DESTDIR)$(bindir)/gnatlink$(exeext); \ fi ; \ fi -if [ -f gnat1$(exeext) ] ; \ then \ if [ -f gnatls-cross$(exeext) ] ; \ then \ - $(RM) $(bindir)/$(target_alias)-gnatls$(exeext); \ - $(INSTALL_PROGRAM) gnatls-cross$(exeext) $(bindir)/$(target_alias)-gnatls$(exeext); \ - if [ -d $(tooldir)/bin/. ] ; then \ - rm -f $(tooldir)/bin/gnatls$(exeext); \ - $(INSTALL_PROGRAM) gnatls-cross$(exeext) $(tooldir)/bin/gnatls$(exeext); \ + $(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatls$(exeext); \ + $(INSTALL_PROGRAM) gnatls-cross$(exeext) $(DESTDIR)$(bindir)/$(target_alias)-gnatls$(exeext); \ + if [ -d $(DESTDIR)$(tooldir)/bin/. ] ; then \ + rm -f $(DESTDIR)$(tooldir)/bin/gnatls$(exeext); \ + $(INSTALL_PROGRAM) gnatls-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatls$(exeext); \ fi; \ else \ - $(RM) $(bindir)/gnatls$(exeext); \ - $(INSTALL_PROGRAM) gnatls$(exeext) $(bindir)/gnatls$(exeext); \ + $(RM) $(DESTDIR)$(bindir)/gnatls$(exeext); \ + $(INSTALL_PROGRAM) gnatls$(exeext) $(DESTDIR)$(bindir)/gnatls$(exeext); \ fi ; \ fi -if [ -f gnat1$(exeext) ] ; \ then \ if [ -f gnatmake-cross$(exeext) ] ; \ then \ - $(RM) $(bindir)/$(target_alias)-gnatmake$(exeext); \ - $(INSTALL_PROGRAM) gnatmake-cross$(exeext) $(bindir)/$(target_alias)-gnatmake$(exeext); \ - if [ -d $(tooldir)/bin/. ] ; then \ - rm -f $(tooldir)/bin/gnatmake$(exeext); \ - $(INSTALL_PROGRAM) gnatmake-cross$(exeext) $(tooldir)/bin/gnatmake$(exeext); \ + $(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatmake$(exeext); \ + $(INSTALL_PROGRAM) gnatmake-cross$(exeext) $(DESTDIR)$(bindir)/$(target_alias)-gnatmake$(exeext); \ + if [ -d $(DESTDIR)$(tooldir)/bin/. ] ; then \ + rm -f $(DESTDIR)$(tooldir)/bin/gnatmake$(exeext); \ + $(INSTALL_PROGRAM) gnatmake-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatmake$(exeext); \ fi; \ else \ - $(RM) $(bindir)/gnatmake$(exeext); \ - $(INSTALL_PROGRAM) gnatmake$(exeext) $(bindir)/gnatmake$(exeext); \ + $(RM) $(DESTDIR)$(bindir)/gnatmake$(exeext); \ + $(INSTALL_PROGRAM) gnatmake$(exeext) $(DESTDIR)$(bindir)/gnatmake$(exeext); \ fi ; \ fi -if [ -f gnat1$(exeext) ] ; \ then \ if [ -f gnatmem-cross$(exeext) ] ; \ then \ - $(RM) $(bindir)/$(target_alias)-gnatmem$(exeext); \ - $(INSTALL_PROGRAM) gnatmem-cross$(exeext) $(bindir)/$(target_alias)-gnatmem$(exeext); \ + $(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatmem$(exeext); \ + $(INSTALL_PROGRAM) gnatmem-cross$(exeext) $(DESTDIR)$(bindir)/$(target_alias)-gnatmem$(exeext); \ else \ - $(RM) $(bindir)/gnatmem$(exeext); \ - $(INSTALL_PROGRAM) gnatmem$(exeext) $(bindir)/gnatmem$(exeext); \ + $(RM) $(DESTDIR)$(bindir)/gnatmem$(exeext); \ + $(INSTALL_PROGRAM) gnatmem$(exeext) $(DESTDIR)$(bindir)/gnatmem$(exeext); \ fi ; \ fi -if [ -f gnat1$(exeext) ] ; \ then \ if [ -f gnatname-cross$(exeext) ] ; \ then \ - $(RM) $(bindir)/$(target_alias)-gnatname$(exeext); \ - $(INSTALL_PROGRAM) gnatname-cross$(exeext) $(bindir)/$(target_alias)-gnatname$(exeext); \ + $(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatname$(exeext); \ + $(INSTALL_PROGRAM) gnatname-cross$(exeext) $(DESTDIR)$(bindir)/$(target_alias)-gnatname$(exeext); \ else \ - $(RM) $(bindir)/gnatname$(exeext); \ - $(INSTALL_PROGRAM) gnatname$(exeext) $(bindir)/gnatname$(exeext); \ + $(RM) $(DESTDIR)$(bindir)/gnatname$(exeext); \ + $(INSTALL_PROGRAM) gnatname$(exeext) $(DESTDIR)$(bindir)/gnatname$(exeext); \ fi ; \ fi -if [ -f gnat1$(exeext) ] ; \ then \ if [ -f gnatprep-cross$(exeext) ] ; \ then \ - $(RM) $(bindir)/$(target_alias)-gnatprep$(exeext); \ - $(INSTALL_PROGRAM) gnatprep-cross$(exeext) $(bindir)/$(target_alias)-gnatprep$(exeext); \ - if [ -d $(tooldir)/bin/. ] ; then \ - rm -f $(tooldir)/bin/gnatprep$(exeext); \ - $(INSTALL_PROGRAM) gnatprep-cross$(exeext) $(tooldir)/bin/gnatprep$(exeext); \ + $(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatprep$(exeext); \ + $(INSTALL_PROGRAM) gnatprep-cross$(exeext) $(DESTDIR)$(bindir)/$(target_alias)-gnatprep$(exeext); \ + if [ -d $(DESTDIR)$(tooldir)/bin/. ] ; then \ + rm -f $(DESTDIR)$(tooldir)/bin/gnatprep$(exeext); \ + $(INSTALL_PROGRAM) gnatprep-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatprep$(exeext); \ fi; \ else \ - $(RM) $(bindir)/gnatprep$(exeext); \ - $(INSTALL_PROGRAM) gnatprep$(exeext) $(bindir)/gnatprep$(exeext); \ + $(RM) $(DESTDIR)$(bindir)/gnatprep$(exeext); \ + $(INSTALL_PROGRAM) gnatprep$(exeext) $(DESTDIR)$(bindir)/gnatprep$(exeext); \ fi ; \ fi -if [ -f gnat1$(exeext) ] ; \ then \ if [ -f gnatpsta-cross$(exeext) ] ; \ then \ - $(RM) $(bindir)/$(target_alias)-gnatpsta$(exeext); \ - $(INSTALL_PROGRAM) gnatpsta-cross$(exeext) $(bindir)/$(target_alias)-gnatpsta$(exeext); \ - if [ -d $(tooldir)/bin/. ] ; then \ - rm -f $(tooldir)/bin/gnatpsta$(exeext); \ - $(INSTALL_PROGRAM) gnatpsta-cross$(exeext) $(tooldir)/bin/gnatpsta$(exeext); \ + $(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatpsta$(exeext); \ + $(INSTALL_PROGRAM) gnatpsta-cross$(exeext) $(DESTDIR)$(bindir)/$(target_alias)-gnatpsta$(exeext); \ + if [ -d $(DESTDIR)$(tooldir)/bin/. ] ; then \ + rm -f $(DESTDIR)$(tooldir)/bin/gnatpsta$(exeext); \ + $(INSTALL_PROGRAM) gnatpsta-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatpsta$(exeext); \ fi; \ else \ - $(RM) $(bindir)/gnatpsta$(exeext); \ - $(INSTALL_PROGRAM) gnatpsta$(exeext) $(bindir)/gnatpsta$(exeext); \ + $(RM) $(DESTDIR)$(bindir)/gnatpsta$(exeext); \ + $(INSTALL_PROGRAM) gnatpsta$(exeext) $(DESTDIR)$(bindir)/gnatpsta$(exeext); \ fi ; \ fi -if [ -f gnat1$(exeext) ] ; \ then \ if [ -f gnatxref-cross$(exeext) ] ; \ then \ - $(RM) $(bindir)/$(target_alias)-gnatxref$(exeext); \ - $(INSTALL_PROGRAM) gnatxref-cross$(exeext) $(bindir)/$(target_alias)-gnatxref$(exeext); \ + $(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatxref$(exeext); \ + $(INSTALL_PROGRAM) gnatxref-cross$(exeext) $(DESTDIR)$(bindir)/$(target_alias)-gnatxref$(exeext); \ else \ - $(RM) $(bindir)/gnatxref$(exeext); \ - $(INSTALL_PROGRAM) gnatxref$(exeext) $(bindir)/gnatxref$(exeext); \ + $(RM) $(DESTDIR)$(bindir)/gnatxref$(exeext); \ + $(INSTALL_PROGRAM) gnatxref$(exeext) $(DESTDIR)$(bindir)/gnatxref$(exeext); \ fi ; \ fi -if [ -f gnat1$(exeext) ] ; \ then \ if [ -f gnatfind-cross$(exeext) ] ; \ then \ - $(RM) $(bindir)/$(target_alias)-gnatfind$(exeext); \ - $(INSTALL_PROGRAM) gnatfind-cross$(exeext) $(bindir)/$(target_alias)-gnatfind$(exeext); \ + $(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatfind$(exeext); \ + $(INSTALL_PROGRAM) gnatfind-cross$(exeext) $(DESTDIR)$(bindir)/$(target_alias)-gnatfind$(exeext); \ else \ - $(RM) $(bindir)/gnatfind$(exeext); \ - $(INSTALL_PROGRAM) gnatfind$(exeext) $(bindir)/gnatfind$(exeext); \ + $(RM) $(DESTDIR)$(bindir)/gnatfind$(exeext); \ + $(INSTALL_PROGRAM) gnatfind$(exeext) $(DESTDIR)$(bindir)/gnatfind$(exeext); \ fi ; \ fi -if [ -f gnat1$(exeext) ] ; \ then \ if [ -f gnatchop$(exeext) ] ; \ then \ - $(RM) $(bindir)/gnatchop$(exeext); \ - $(INSTALL_PROGRAM) gnatchop$(exeext) $(bindir)/gnatchop$(exeext); \ + $(RM) $(DESTDIR)$(bindir)/gnatchop$(exeext); \ + $(INSTALL_PROGRAM) gnatchop$(exeext) $(DESTDIR)$(bindir)/gnatchop$(exeext); \ fi ; \ # # Gnatlbr is only used on VMS. @@ -688,8 +688,8 @@ ada.install-common: then \ if [ -f gnatlbr$(exeext) ] ; \ then \ - $(RM) $(bindir)/gnatlbr$(exeext); \ - $(INSTALL_PROGRAM) gnatlbr$(exeext) $(bindir)/gnatlbr$(exeext); \ + $(RM) $(DESTDIR)$(bindir)/gnatlbr$(exeext); \ + $(INSTALL_PROGRAM) gnatlbr$(exeext) $(DESTDIR)$(bindir)/gnatlbr$(exeext); \ fi ; \ fi # @@ -697,8 +697,8 @@ ada.install-common: # -if [ -f gnat1$(exeext) ] ; \ then \ - $(RM) $(bindir)/gnatdll$(exeext); \ - $(INSTALL_PROGRAM) gnatdll$(exeext) $(bindir)/gnatdll$(exeext); \ + $(RM) $(DESTDIR)$(bindir)/gnatdll$(exeext); \ + $(INSTALL_PROGRAM) gnatdll$(exeext) $(DESTDIR)$(bindir)/gnatdll$(exeext); \ fi # # Finally, install the library @@ -715,46 +715,46 @@ ada.install-info: ada.install-man: ada.uninstall: - -$(RM) $(bindir)/gnatbind$(exeext) - -$(RM) $(bindir)/gnatbl$(exeext) - -$(RM) $(bindir)/gnatchop$(exeext) - -$(RM) $(bindir)/gnat$(exeext) - -$(RM) $(bindir)/gnatdll$(exeext) - -$(RM) $(bindir)/gnatkr$(exeext) - -$(RM) $(bindir)/gnatlink$(exeext) - -$(RM) $(bindir)/gnatls$(exeext) - -$(RM) $(bindir)/gnatmake$(exeext) - -$(RM) $(bindir)/gnatmem$(exeext) - -$(RM) $(bindir)/gnatname$(exeext) - -$(RM) $(bindir)/gnatprep$(exeext) - -$(RM) $(bindir)/gnatpsta$(exeext) - -$(RM) $(bindir)/$(target_alias)-gnatbind$(exeext) - -$(RM) $(bindir)/$(target_alias)-gnatbl$(exeext) - -$(RM) $(bindir)/$(target_alias)-gnatchop$(exeext) - -$(RM) $(bindir)/$(target_alias)-gnat$(exeext) - -$(RM) $(bindir)/$(target_alias)-gnatkr(exeext) - -$(RM) $(bindir)/$(target_alias)-gnatlink$(exeext) - -$(RM) $(bindir)/$(target_alias)-gnatls$(exeext) - -$(RM) $(bindir)/$(target_alias)-gnatmake$(exeext) - -$(RM) $(bindir)/$(target_alias)-gnatmem$(exeext) - -$(RM) $(bindir)/$(target_alias)-gnatname$(exeext) - -$(RM) $(bindir)/$(target_alias)-gnatprep$(exeext) - -$(RM) $(bindir)/$(target_alias)-gnatpsta$(exeext) - -$(RM) $(tooldir)/bin/gnatbind$(exeext) - -$(RM) $(tooldir)/bin/gnatbl$(exeext) - -$(RM) $(tooldir)/bin/gnatchop$(exeext) - -$(RM) $(tooldir)/bin/gnat$(exeext) - -$(RM) $(tooldir)/bin/gnatdll$(exeext) - -$(RM) $(tooldir)/bin/gnatkr$(exeext) - -$(RM) $(tooldir)/bin/gnatlink$(exeext) - -$(RM) $(tooldir)/bin/gnatls$(exeext) - -$(RM) $(tooldir)/bin/gnatmake$(exeext) - -$(RM) $(tooldir)/bin/gnatmem$(exeext) - -$(RM) $(tooldir)/bin/gnatname$(exeext) - -$(RM) $(tooldir)/bin/gnatprep$(exeext) - -$(RM) $(tooldir)/bin/gnatpsta$(exeext) + -$(RM) $(DESTDIR)$(bindir)/gnatbind$(exeext) + -$(RM) $(DESTDIR)$(bindir)/gnatbl$(exeext) + -$(RM) $(DESTDIR)$(bindir)/gnatchop$(exeext) + -$(RM) $(DESTDIR)$(bindir)/gnat$(exeext) + -$(RM) $(DESTDIR)$(bindir)/gnatdll$(exeext) + -$(RM) $(DESTDIR)$(bindir)/gnatkr$(exeext) + -$(RM) $(DESTDIR)$(bindir)/gnatlink$(exeext) + -$(RM) $(DESTDIR)$(bindir)/gnatls$(exeext) + -$(RM) $(DESTDIR)$(bindir)/gnatmake$(exeext) + -$(RM) $(DESTDIR)$(bindir)/gnatmem$(exeext) + -$(RM) $(DESTDIR)$(bindir)/gnatname$(exeext) + -$(RM) $(DESTDIR)$(bindir)/gnatprep$(exeext) + -$(RM) $(DESTDIR)$(bindir)/gnatpsta$(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)-gnat$(exeext) + -$(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatkr(exeext) + -$(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatlink$(exeext) + -$(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatls$(exeext) + -$(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatmake$(exeext) + -$(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatmem$(exeext) + -$(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatname$(exeext) + -$(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatprep$(exeext) + -$(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatpsta$(exeext) + -$(RM) $(DESTDIR)$(tooldir)/bin/gnatbind$(exeext) + -$(RM) $(DESTDIR)$(tooldir)/bin/gnatbl$(exeext) + -$(RM) $(DESTDIR)$(tooldir)/bin/gnatchop$(exeext) + -$(RM) $(DESTDIR)$(tooldir)/bin/gnat$(exeext) + -$(RM) $(DESTDIR)$(tooldir)/bin/gnatdll$(exeext) + -$(RM) $(DESTDIR)$(tooldir)/bin/gnatkr$(exeext) + -$(RM) $(DESTDIR)$(tooldir)/bin/gnatlink$(exeext) + -$(RM) $(DESTDIR)$(tooldir)/bin/gnatls$(exeext) + -$(RM) $(DESTDIR)$(tooldir)/bin/gnatmake$(exeext) + -$(RM) $(DESTDIR)$(tooldir)/bin/gnatmem$(exeext) + -$(RM) $(DESTDIR)$(tooldir)/bin/gnatname$(exeext) + -$(RM) $(DESTDIR)$(tooldir)/bin/gnatprep$(exeext) + -$(RM) $(DESTDIR)$(tooldir)/bin/gnatpsta$(exeext) # Gnatlbr and Gnatchop are only used on VMS - -$(RM) $(bindir)/gnatlbr$(exeext) $(bindir)/gnatchop$(exeext) + -$(RM) $(DESTDIR)$(bindir)/gnatlbr$(exeext) $(DESTDIR)$(bindir)/gnatchop$(exeext) # Clean hooks: # A lot of the ancillary files are deleted by the main makefile. diff --git a/gcc/ada/Makefile.in b/gcc/ada/Makefile.in index e4e6bb2e508..88e75c9d743 100644 --- a/gcc/ada/Makefile.in +++ b/gcc/ada/Makefile.in @@ -1711,38 +1711,38 @@ install-gnatlib: ../stamp-gnatlib # Create the directory before deleting it, in case the directory is # a list of directories (as it may be on VMS). This ensures we are # deleting the right one. - -$(MKDIR) $(ADA_RTL_OBJ_DIR) - -$(MKDIR) $(ADA_INCLUDE_DIR) - $(RMDIR) $(ADA_RTL_OBJ_DIR) - $(RMDIR) $(ADA_INCLUDE_DIR) - -$(MKDIR) $(ADA_RTL_OBJ_DIR) - -$(MKDIR) $(ADA_INCLUDE_DIR) - -$(INSTALL_DATA) ada/rts/Makefile.adalib $(ADA_RTL_OBJ_DIR) + -$(MKDIR) $(DESTDIR)$(ADA_RTL_OBJ_DIR) + -$(MKDIR) $(DESTDIR)$(ADA_INCLUDE_DIR) + $(RMDIR) $(DESTDIR)$(ADA_RTL_OBJ_DIR) + $(RMDIR) $(DESTDIR)$(ADA_INCLUDE_DIR) + -$(MKDIR) $(DESTDIR)$(ADA_RTL_OBJ_DIR) + -$(MKDIR) $(DESTDIR)$(ADA_INCLUDE_DIR) + -$(INSTALL_DATA) ada/rts/Makefile.adalib $(DESTDIR)$(ADA_RTL_OBJ_DIR) for file in ada/rts/*.ali; do \ - $(INSTALL_DATA) $$file $(ADA_RTL_OBJ_DIR); \ + $(INSTALL_DATA) $$file $(DESTDIR)$(ADA_RTL_OBJ_DIR); \ done -for file in ada/rts/*$(arext);do \ - $(INSTALL_DATA) $$file $(ADA_RTL_OBJ_DIR); \ + $(INSTALL_DATA) $$file $(DESTDIR)$(ADA_RTL_OBJ_DIR); \ done ifeq ($(strip $(filter-out alpha% dec vms% openvms% alphavms%,$(targ))),) -for file in ada/rts/lib*$(soext);do \ - $(INSTALL_DATA) $$file $(ADA_RTL_OBJ_DIR); \ + $(INSTALL_DATA) $$file $(DESTDIR)$(ADA_RTL_OBJ_DIR); \ done else -for file in ada/rts/lib*-**$(soext);do \ - $(INSTALL_DATA) $$file $(ADA_RTL_OBJ_DIR); \ + $(INSTALL_DATA) $$file $(DESTDIR)$(ADA_RTL_OBJ_DIR); \ done endif - -$(LN_S) $(ADA_RTL_OBJ_DIR)/libgnat-*$(soext) \ - $(ADA_RTL_OBJ_DIR)/libgnat$(soext) - -$(LN_S) $(ADA_RTL_OBJ_DIR)/libgnarl-*$(soext) \ - $(ADA_RTL_OBJ_DIR)/libgnarl$(soext) + -( cd $(DESTDIR)$(ADA_RTL_OBJ_DIR) && \ + $(LN_S) libgnat-*$(soext) libgnat$(soext) ) + -( cd $(DESTDIR)$(ADA_RTL_OBJ_DIR) && \ + $(LN_S) libgnarl-*$(soext) libgnarl$(soext) ) # This copy must be done preserving the date on the original file. for file in ada/rts/*.adb ada/rts/*.ads; do \ - $(INSTALL_DATA_DATE) $$file $(ADA_INCLUDE_DIR); \ + $(INSTALL_DATA_DATE) $$file $(DESTDIR)$(ADA_INCLUDE_DIR); \ done - cd $(ADA_INCLUDE_DIR); $(CHMOD) a-wx *.adb - cd $(ADA_INCLUDE_DIR); $(CHMOD) a-wx *.ads + cd $(DESTDIR)$(ADA_INCLUDE_DIR); $(CHMOD) a-wx *.adb + cd $(DESTDIR)$(ADA_INCLUDE_DIR); $(CHMOD) a-wx *.ads ../stamp-gnatlib2: $(RM) rts/s-*.ali @@ -1795,7 +1795,7 @@ gnatlib: ../stamp-gnatlib1 ../stamp-gnatlib2 $(MAKE) -C rts CC="../../xgcc -B../../" \ INCLUDES="$(INCLUDES_FOR_SUBDIR) -I./../.." \ CFLAGS="$(GNATLIBCFLAGS_FOR_C)" \ - srcdir=$(fsrcdir) \ + srcdir=$(fsrcdir) VPATH=$(fsrcdir) \ -f ../Makefile $(LIBGNAT_OBJS) prefix.o $(MAKE) -C rts CC="../../xgcc -B../../" \ ADA_INCLUDES="$(ADA_INCLUDES_FOR_SUBDIR)" \ @@ -1854,7 +1854,7 @@ prepare-rts: endif install-rts: force - $(CP) -r rts-$(RTS_NAME) $(libsubdir)/ + $(CP) -r rts-$(RTS_NAME) $(DESTDIR)$(libsubdir)/ rts-none: force $(MAKE) $(FLAGS_TO_PASS) prepare-rts \ -- 2.11.4.GIT