Honour DESTDIR

diff --git a/ChangeLog b/ChangeLog
index 3a200afb31d1454c7780a8bb24ea2fd9f82d71bd..03be90061c251327d6463667633621230b14cb8f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-05-07  Federico G. Schwindt <fgsch@olimpo.com.br>
+
+       * Makefile.in: Honour DESTDIR.
+
 2002-05-05  Alexandre Oliva  <aoliva@redhat.com>
 
        * configure.in (noconfigdirs): Don't disable libgcj on

diff --git a/Makefile.in b/Makefile.in
index 70bf102fcdb0e422d746982d1cd3840b10a03ed3..12a69d3d3e6beb4983929a0446d00ff84f50f4fe 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1826,8 +1826,8 @@ install-sid: install-tcl install-tk
 ### other supporting targets
 
 MAKEDIRS= \
-       $(prefix) \
-       $(exec_prefix)
+       $(DESTDIR)$(prefix) \
+       $(DESTDIR)$(exec_prefix)
 .PHONY: installdirs
 installdirs: mkinstalldirs
        $(SHELL) $(srcdir)/mkinstalldirs $(MAKEDIRS)

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 2c2b5379314a7a5b5c412767aae7390e70a714eb..04311347b52e50518c70abfdd3fe8f6bafa47c63 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-07  Federico G. Schwindt <fgsch@olimpo.com.br>
+
+       * Makefile.am: Honour DESTDIR.
+       * Makefile.in: Regenerate.
+
 2002-05-06  Alan Modra  <amodra@bigpond.net.au>
 
        * dlltool.c (process_def_file): Add missing prototype.

diff --git a/binutils/Makefile.am b/binutils/Makefile.am
index 09d9a24e8151d46fc4c2fbede84cd78ecec41309..8246d423c0ebf6d982339fe6d626bb0c7cb9bc97 100644 (file)
--- a/binutils/Makefile.am
+++ b/binutils/Makefile.am
@@ -348,18 +348,18 @@ install-exec-local: install-binPROGRAMS $(bin_PROGRAMS) $(noinst_PROGRAMS)
        @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//' -e 's/cxxfilt/$(DEMANGLER_NAME)/'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
-           $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed -e 's/$(EXEEXT)$$//' -e 's/-new//' -e 's/cxxfilt/$(DEMANGLER_NAME)/'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+           $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed -e 's/$(EXEEXT)$$//' -e 's/-new//' -e 's/cxxfilt/$(DEMANGLER_NAME)/'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
          else :; fi; \
        done
-       $(mkinstalldirs) $(tooldir)/bin
+       $(mkinstalldirs) $(DESTDIR)$(tooldir)/bin
        for i in $(TOOL_PROGS); do \
          if [ -f $$i$(EXEEXT) ]; then \
            j=`echo $$i | sed -e 's/-new//'`; \
            k=`echo $$j | sed '$(transform)'`; \
-           if [ "$(bindir)/$$k$(EXEEXT)" != "$(tooldir)/bin/$$j$(EXEEXT)" ]; then \
-             rm -f $(tooldir)/bin/$$j$(EXEEXT); \
-             ln $(bindir)/$$k$(EXEEXT) $(tooldir)/bin/$$j$(EXEEXT) >/dev/null 2>/dev/null \
-               || $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$i$(EXEEXT) $(tooldir)/bin/$$j$(EXEEXT); \
+           if [ "$(DESTDIR)$(bindir)/$$k$(EXEEXT)" != "$(DESTDIR)$(tooldir)/bin/$$j$(EXEEXT)" ]; then \
+             rm -f $(DESTDIR)$(tooldir)/bin/$$j$(EXEEXT); \
+             ln $(DESTDIR)$(bindir)/$$k$(EXEEXT) $(DESTDIR)$(tooldir)/bin/$$j$(EXEEXT) >/dev/null 2>/dev/null \
+               || $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$i$(EXEEXT) $(DESTDIR)$(tooldir)/bin/$$j$(EXEEXT); \
            fi; \
          else true; \
          fi; \

diff --git a/binutils/Makefile.in b/binutils/Makefile.in
index bec4a3ffa9dda185724d3366cb874bdd306999da..f2518af8d34df2d0ab8662e81603e4098475bb77 100644 (file)
--- a/binutils/Makefile.in
+++ b/binutils/Makefile.in
@@ -435,7 +435,7 @@ configure.in deflex.c defparse.c nlmheader.c rclex.c rcparse.c
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = tar
+TAR = gtar
 GZIP_ENV = --best
 SOURCES = $(nlmconv_SOURCES) $(srconv_SOURCES) $(sysdump_SOURCES) $(coffdump_SOURCES) $(dlltool_SOURCES) $(windres_SOURCES) $(dllwrap_SOURCES) $(size_SOURCES) $(objdump_SOURCES) $(ar_SOURCES) $(strings_SOURCES) $(ranlib_SOURCES) $(objcopy_SOURCES) $(addr2line_SOURCES) $(readelf_SOURCES) $(nm_new_SOURCES) $(strip_new_SOURCES) $(cxxfilt_SOURCES)
 OBJECTS = $(nlmconv_OBJECTS) $(srconv_OBJECTS) $(sysdump_OBJECTS) $(coffdump_OBJECTS) $(dlltool_OBJECTS) $(windres_OBJECTS) $(dllwrap_OBJECTS) $(size_OBJECTS) $(objdump_OBJECTS) $(ar_OBJECTS) $(strings_OBJECTS) $(ranlib_OBJECTS) $(objcopy_OBJECTS) $(addr2line_OBJECTS) $(readelf_OBJECTS) $(nm_new_OBJECTS) $(strip_new_OBJECTS) $(cxxfilt_OBJECTS)
@@ -1074,18 +1074,18 @@ install-exec-local: install-binPROGRAMS $(bin_PROGRAMS) $(noinst_PROGRAMS)
        @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//' -e 's/cxxfilt/$(DEMANGLER_NAME)/'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
-           $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed -e 's/$(EXEEXT)$$//' -e 's/-new//' -e 's/cxxfilt/$(DEMANGLER_NAME)/'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+           $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed -e 's/$(EXEEXT)$$//' -e 's/-new//' -e 's/cxxfilt/$(DEMANGLER_NAME)/'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
          else :; fi; \
        done
-       $(mkinstalldirs) $(tooldir)/bin
+       $(mkinstalldirs) $(DESTDIR)$(tooldir)/bin
        for i in $(TOOL_PROGS); do \
          if [ -f $$i$(EXEEXT) ]; then \
            j=`echo $$i | sed -e 's/-new//'`; \
            k=`echo $$j | sed '$(transform)'`; \
-           if [ "$(bindir)/$$k$(EXEEXT)" != "$(tooldir)/bin/$$j$(EXEEXT)" ]; then \
-             rm -f $(tooldir)/bin/$$j$(EXEEXT); \
-             ln $(bindir)/$$k$(EXEEXT) $(tooldir)/bin/$$j$(EXEEXT) >/dev/null 2>/dev/null \
-               || $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$i$(EXEEXT) $(tooldir)/bin/$$j$(EXEEXT); \
+           if [ "$(DESTDIR)$(bindir)/$$k$(EXEEXT)" != "$(DESTDIR)$(tooldir)/bin/$$j$(EXEEXT)" ]; then \
+             rm -f $(DESTDIR)$(tooldir)/bin/$$j$(EXEEXT); \
+             ln $(DESTDIR)$(bindir)/$$k$(EXEEXT) $(DESTDIR)$(tooldir)/bin/$$j$(EXEEXT) >/dev/null 2>/dev/null \
+               || $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$i$(EXEEXT) $(DESTDIR)$(tooldir)/bin/$$j$(EXEEXT); \
            fi; \
          else true; \
          fi; \

diff --git a/gas/ChangeLog b/gas/ChangeLog
index edc648e82ef2e6e7a0de094c94e38eec55e87b11..ae3ea08769ec8eb50bfb3ff8e49ca0d2980bede3 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-07  Federico G. Schwindt <fgsch@olimpo.com.br>
+
+       * Makefile.am: Honour DESTDIR.
+       * Makefile.in: Regenerate.
+
 2002-05-06  Kazu Hirata  <kazu@cs.umass.edu>
 
        * config/tc-ia64.c: Fix formatting.

diff --git a/gas/Makefile.am b/gas/Makefile.am
index d4d0732a763a8b4cc64841e73bf66f8005817aa3..5c539c3dbc8170cb3346c40da90101d2810ce5da 100644 (file)
--- a/gas/Makefile.am
+++ b/gas/Makefile.am
@@ -668,21 +668,21 @@ CLEANFILES = dep.sed DEPTC DEPTCA DEPOBJ DEPOBJA DEP2 DEP2A DEP1 DEPA DEP DEPDIR
 install-exec-local: install-exec-bindir @install_tooldir@
 
 install-exec-bindir: $(noinst_PROGRAMS)
-       $(mkinstalldirs) $(bindir)
+       $(mkinstalldirs) $(DESTDIR)$(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)/'`; \
+           $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed -e 's/$(EXEEXT)$$//' -e 's/-new//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
          else :; fi; \
        done
 
 install-exec-tooldir: install-exec-bindir $(noinst_PROGRAMS)
-       $(mkinstalldirs) $(tooldir)/bin
+       $(mkinstalldirs) $(DESTDIR)$(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); \
+         rm -f $(DESTDIR)$(tooldir)/bin/as$(EXEEXT); \
+         ln $(DESTDIR)$(bindir)/$$n$(EXEEXT) $(DESTDIR)$(tooldir)/bin/as$(EXEEXT) >/dev/null 2>/dev/null \
+           || $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) as-new$(EXEEXT) $(DESTDIR)$(tooldir)/bin/as$(EXEEXT); \
        else \
          true ; \
        fi

diff --git a/gas/Makefile.in b/gas/Makefile.in
index f7cf9c28da7f7e87001232564b73f80f1ac2464c..b7b9b64b5bd5d782c18aab5d61872c4ebac39b99 100644 (file)
--- a/gas/Makefile.in
+++ b/gas/Makefile.in
@@ -2307,7 +2307,7 @@ configure configure.in gdbinit.in itbl-lex.c itbl-parse.c
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = tar
+TAR = gtar
 GZIP_ENV = --best
 SOURCES = $(gasp_new_SOURCES) $(itbl_test_SOURCES) $(as_new_SOURCES) $(EXTRA_as_new_SOURCES)
 OBJECTS = $(gasp_new_OBJECTS) $(itbl_test_OBJECTS) $(as_new_OBJECTS)
@@ -2851,21 +2851,21 @@ cgen.o: cgen.c cgen.h cgen-desc.h subsegs.h \
 install-exec-local: install-exec-bindir @install_tooldir@
 
 install-exec-bindir: $(noinst_PROGRAMS)
-       $(mkinstalldirs) $(bindir)
+       $(mkinstalldirs) $(DESTDIR)$(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)/'`; \
+           $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed -e 's/$(EXEEXT)$$//' -e 's/-new//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
          else :; fi; \
        done
 
 install-exec-tooldir: install-exec-bindir $(noinst_PROGRAMS)
-       $(mkinstalldirs) $(tooldir)/bin
+       $(mkinstalldirs) $(DESTDIR)$(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); \
+         rm -f $(DESTDIR)$(tooldir)/bin/as$(EXEEXT); \
+         ln $(DESTDIR)$(bindir)/$$n$(EXEEXT) $(DESTDIR)$(tooldir)/bin/as$(EXEEXT) >/dev/null 2>/dev/null \
+           || $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) as-new$(EXEEXT) $(DESTDIR)$(tooldir)/bin/as$(EXEEXT); \
        else \
          true ; \
        fi

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 93ebd70f4ee5f113418feaf9054f655ac07ef9ad..781d577897a01bc7a8e6c18c613792afd39f8097 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-07  Federico G. Schwindt <fgsch@olimpo.com.br>
+
+       * Makefile.am: Honour DESTDIR.
+       * Makefile.in: Regenerate.
+
 2002-05-07  Richard Sandiford  <rsandifo@redhat.com>
 
        * ldlang.h (lang_output_section_statement_type): Add update_dot_tree.

diff --git a/ld/Makefile.am b/ld/Makefile.am
index 93ae6b66e379ce745aeef733a7bcb09fbfdfdfc7..592ba829d54b9bab0475c77072a93dc745f00f11 100644 (file)
--- a/ld/Makefile.am
+++ b/ld/Makefile.am
@@ -1127,24 +1127,24 @@ CLEANFILES = dep.sed DEP DEPA DEP1 DEP2
 .PHONY: install-exec-local install-data-local
 
 install-exec-local: ld-new$(EXEEXT)
-       $(mkinstalldirs) $(bindir) $(tooldir)/bin
+       $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(tooldir)/bin
        @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)/'`; \
+           $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed -e 's/$(EXEEXT)$$//' -e 's/-new//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
          else :; fi; \
        done
        n=`echo ld | sed '$(transform)'`; \
        if [ "$(bindir)/$$n$(EXEEXT)" != "$(tooldir)/bin/ld$(EXEEXT)" ]; then \
-         rm -f $(tooldir)/bin/ld$(EXEEXT); \
-         ln $(bindir)/$$n$(EXEEXT) $(tooldir)/bin/ld$(EXEEXT) >/dev/null 2>/dev/null \
-         || $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) ld-new$(EXEEXT) $(tooldir)/bin/ld$(EXEEXT); \
+         rm -f $(DESTDIR)$(tooldir)/bin/ld$(EXEEXT); \
+         ln $(DESTDIR)$(bindir)/$$n$(EXEEXT) $(DESTDIR)$(tooldir)/bin/ld$(EXEEXT) >/dev/null 2>/dev/null \
+         || $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) ld-new$(EXEEXT) $(DESTDIR)$(tooldir)/bin/ld$(EXEEXT); \
        fi
 
 install-data-local:
-       $(mkinstalldirs) $(scriptdir)/ldscripts
+       $(mkinstalldirs) $(DESTDIR)$(scriptdir)/ldscripts
        for f in ldscripts/*; do \
-         $(INSTALL_DATA) $$f $(scriptdir)/$$f ; \
+         $(INSTALL_DATA) $$f $(DESTDIR)$(scriptdir)/$$f ; \
        done
 
 # We want install to imply install-info as per GNU standards, despite the

diff --git a/ld/Makefile.in b/ld/Makefile.in
index 31170347208cc900344e75212c7f2ac62ee761cc..4fa96ce63dcdd653d450ad89d9b092de5e400c78 100644 (file)
--- a/ld/Makefile.in
+++ b/ld/Makefile.in
@@ -1828,24 +1828,24 @@ mostlyclean-local:
 .PHONY: install-exec-local install-data-local
 
 install-exec-local: ld-new$(EXEEXT)
-       $(mkinstalldirs) $(bindir) $(tooldir)/bin
+       $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(tooldir)/bin
        @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)/'`; \
+           $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed -e 's/$(EXEEXT)$$//' -e 's/-new//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
          else :; fi; \
        done
        n=`echo ld | sed '$(transform)'`; \
        if [ "$(bindir)/$$n$(EXEEXT)" != "$(tooldir)/bin/ld$(EXEEXT)" ]; then \
-         rm -f $(tooldir)/bin/ld$(EXEEXT); \
-         ln $(bindir)/$$n$(EXEEXT) $(tooldir)/bin/ld$(EXEEXT) >/dev/null 2>/dev/null \
-         || $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) ld-new$(EXEEXT) $(tooldir)/bin/ld$(EXEEXT); \
+         rm -f $(DESTDIR)$(tooldir)/bin/ld$(EXEEXT); \
+         ln $(DESTDIR)$(bindir)/$$n$(EXEEXT) $(DESTDIR)$(tooldir)/bin/ld$(EXEEXT) >/dev/null 2>/dev/null \
+         || $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) ld-new$(EXEEXT) $(DESTDIR)$(tooldir)/bin/ld$(EXEEXT); \
        fi
 
 install-data-local:
-       $(mkinstalldirs) $(scriptdir)/ldscripts
+       $(mkinstalldirs) $(DESTDIR)$(scriptdir)/ldscripts
        for f in ldscripts/*; do \
-         $(INSTALL_DATA) $$f $(scriptdir)/$$f ; \
+         $(INSTALL_DATA) $$f $(DESTDIR)$(scriptdir)/$$f ; \
        done
 
 # We want install to imply install-info as per GNU standards, despite the