PATCH: honour DESTDIR

[Nick Clifton]

Hi Frederico,

> hi,
> 
>   Ok, you said in the past that I can send diffs to you.
>   This is the first time I send stuff to FSF, so my apologies if
>   there are any errors.

Please send patches like this to the binutils mailing list, rather
than directly to me.  OI have taken the liberty of forwarding your
email to that this in this particualr case.

>   Here is a first of a few diffs we currently have at OpenBSD.
>   I don't see any problems to have this in the main distro.
>   Comments?

When submitting a patch, please include an explanation of what problem
you are trying to fix (or what feature you are trying to add).

In this case, perhaps you could explain why DESTDIR needs to be
honoured ?

Cheers
        Nick

> bfd/ChangeLog:
> 
> 2002-05-05  Federico G. Schwindt <address@hidden>
> 
>         * Makefile.in: Honour DESTDIR.
> 
> binutils/ChangeLog:
> 
> 2002-05-05  Federico G. Schwindt <address@hidden>
> 
>         * Makefile.am: Honour DESTDIR.
> 
> gas/ChangeLog:
> 
> 2002-05-05  Federico G. Schwindt <address@hidden>
> 
>         * Makefile.am: Honour DESTDIR.
> 
> ld/ChangeLog:
> 
> 2002-05-05  Federico G. Schwindt <address@hidden>
> 
>         * Makefile.am: Honour DESTDIR.
> 
> Index: Makefile.in
> ===================================================================
> RCS file: /cvs/src/src/Makefile.in,v
> retrieving revision 1.51
> diff -u -r1.51 Makefile.in
> --- Makefile.in       30 Apr 2002 02:42:31 -0000      1.51
> +++ Makefile.in       5 May 2002 03:49:42 -0000
> @@ -1826,8 +1826,8 @@
>  ### other supporting targets
>  
>  MAKEDIRS= \
> -     $(prefix) \
> -     $(exec_prefix)
> +     $(DESTDIR)$(prefix) \
> +     $(DESTDIR)$(exec_prefix)
>  .PHONY: installdirs
>  installdirs: mkinstalldirs
>       $(SHELL) $(srcdir)/mkinstalldirs $(MAKEDIRS)
> Index: binutils/Makefile.am
> ===================================================================
> RCS file: /cvs/src/src/binutils/Makefile.am,v
> retrieving revision 1.31
> diff -u -r1.31 Makefile.am
> --- binutils/Makefile.am      4 Apr 2002 14:06:19 -0000       1.31
> +++ binutils/Makefile.am      5 May 2002 03:49:46 -0000
> @@ -348,18 +348,18 @@
>       @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; \
> Index: gas/Makefile.am
> ===================================================================
> RCS file: /cvs/src/src/gas/Makefile.am,v
> retrieving revision 1.54
> diff -u -r1.54 Makefile.am
> --- gas/Makefile.am   4 Apr 2002 14:06:49 -0000       1.54
> +++ gas/Makefile.am   5 May 2002 03:49:57 -0000
> @@ -668,21 +668,21 @@
>  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
> Index: ld/Makefile.am
> ===================================================================
> RCS file: /cvs/src/src/ld/Makefile.am,v
> retrieving revision 1.93
> diff -u -r1.93 Makefile.am
> --- ld/Makefile.am    30 Apr 2002 17:48:58 -0000      1.93
> +++ ld/Makefile.am    5 May 2002 03:50:11 -0000
> @@ -1127,24 +1127,24 @@
>  .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