DESTDIR support.

This commit is contained in:
dholland 2010-02-08 05:18:37 +00:00
parent 63bb67f009
commit 5b36dd8cba
18 changed files with 790 additions and 6 deletions

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.18 2009/02/17 13:02:20 joerg Exp $
# $NetBSD: Makefile,v 1.19 2010/02/08 05:18:37 dholland Exp $
DISTNAME= binutils-2.12.1
PKGNAME= cross-h8300-hms-binutils-2.12.1
@ -11,6 +11,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= # empty
COMMENT= h8300-hms cross utility
PKG_DESTDIR_SUPPORT= user-destdir
H8300_PREFIX= ${PREFIX}/libexec/cross-h8300-hms
WRKSRC= ${WRKDIR}/objdir
@ -24,7 +26,7 @@ SRCDIR= ${WRKDIR}/${DISTNAME}
BUILD_TARGET= CFLAGS="-O2 -fomit-frame-pointer" all
INFO_FILES= # PLIST
INSTALLATION_DIRS= ${H8300_PREFIX}
INSTALLATION_DIRS= bin ${H8300_PREFIX}
post-extract:
${MKDIR} ${WRKSRC}
@ -41,9 +43,10 @@ post-install:
h8300-hms-addr2line h8300-hms-readelf h8300-hms-nm \
h8300-hms-strip h8300-hms-c++filt h8300-hms-as \
h8300-hms-gasp h8300-hms-ld ; do \
${LN} -s ${H8300_PREFIX}/bin/$$f ${PREFIX}/bin/$$f; \
${LN} -s ${H8300_PREFIX}/bin/"$$f" \
${DESTDIR}${PREFIX}/bin/"$$f" || exit 1; \
done
${MV} ${H8300_PREFIX}/lib/libiberty.a \
${H8300_PREFIX}/lib/libiberty_binutils.a
${MV} ${DESTDIR}${H8300_PREFIX}/lib/libiberty.a \
${DESTDIR}${H8300_PREFIX}/lib/libiberty_binutils.a
.include "../../mk/bsd.pkg.mk"

View file

@ -1,5 +1,21 @@
$NetBSD: distinfo,v 1.2 2005/02/24 10:16:53 agc Exp $
$NetBSD: distinfo,v 1.3 2010/02/08 05:18:37 dholland Exp $
SHA1 (binutils-2.12.1.tar.bz2) = 520a49a68832fd4dd1f4a4a75cdd244b74ce8dff
RMD160 (binutils-2.12.1.tar.bz2) = 8696f3618f2b861b7ce84e45d87c6caf9843f1c5
Size (binutils-2.12.1.tar.bz2) = 9543675 bytes
SHA1 (patch-aa) = a13d5173cba83c4b8cedc9f075c6dc8f7ee71821
SHA1 (patch-ab) = 763917c5860aa3975859801065a3edb90bf19e7d
SHA1 (patch-ac) = fe72cd813bdcd1ea1f7ecb41ee94a362140997d5
SHA1 (patch-ad) = ee5ca5d773069602c2d315739ab4e482f36c39b5
SHA1 (patch-ae) = f64df9b6ec4e151fb904b93bdbda41e1f150c823
SHA1 (patch-af) = d59a57d79f504b31e2822650a5f543a0be1dd989
SHA1 (patch-ag) = 23619b91e9b76945a8161145fa9fc57f24574002
SHA1 (patch-ah) = 479a6b5e998d44fb3f29d9664e02c95ba19a6aa6
SHA1 (patch-ai) = a045b2ef8fe3bd16990ca572d2ff7c97808221ba
SHA1 (patch-aj) = 3b53c1df0e1d6a24c71797697d879e326a24a026
SHA1 (patch-ak) = 6e681a7a53d45a71479b871c8d38e8fe0aa0ebd4
SHA1 (patch-al) = 6f583d98efe96de5f0f10821a6557c966d6f39a0
SHA1 (patch-am) = 8e3733fffa11297acb50660357088f6d91d41706
SHA1 (patch-an) = 2cf5da64248e5cb21ef3d171478b22bdf8a11df3
SHA1 (patch-ao) = fdab7e8f4d28bf1fdadd5733de928e103e754fcd
SHA1 (patch-ap) = bec8a8de114b87ab60a4a3916fa158af30f495ec

View file

@ -0,0 +1,25 @@
$NetBSD: patch-aa,v 1.1 2010/02/08 05:18:37 dholland Exp $
DESTDIR support
--- ../binutils-2.12.1/Makefile.in.orig 2002-05-14 23:46:29.000000000 +0000
+++ ../binutils-2.12.1/Makefile.in
@@ -360,6 +360,7 @@ BASE_FLAGS_TO_PASS = \
"CXXFLAGS=$(CXXFLAGS)" \
"CXXFLAGS_FOR_TARGET=$(CXXFLAGS_FOR_TARGET)" \
"CXX_FOR_TARGET=$(CXX_FOR_TARGET)" \
+ "DESTDIR=$(DESTDIR)" \
"DLLTOOL_FOR_TARGET=$(DLLTOOL_FOR_TARGET)" \
"INSTALL=$(INSTALL)" \
"INSTALL_DATA=$(INSTALL_DATA)" \
@@ -1832,7 +1833,9 @@ MAKEDIRS= \
$(exec_prefix)
.PHONY: installdirs
installdirs: mkinstalldirs
- $(SHELL) $(srcdir)/mkinstalldirs $(MAKEDIRS)
+ for dir in $(MAKEDIRS); do \
+ $(SHELL) $(srcdir)/mkinstalldirs ${DESTDIR}$$dir; \
+ done
dir.info: do-install-info
if [ -f $(srcdir)/texinfo/gen-info-dir ] ; then \

View file

@ -0,0 +1,41 @@
$NetBSD: patch-ab,v 1.1 2010/02/08 05:18:37 dholland Exp $
DESTDIR support
--- ../binutils-2.12.1/intl/Makefile.in.orig 2002-03-08 19:25:51.000000000 +0000
+++ ../binutils-2.12.1/intl/Makefile.in
@@ -115,26 +115,26 @@ install-exec: all
if test "$(PACKAGE)" = "gettext" \
&& test '@INTLOBJS@' = '$(GETTOBJS)'; then \
if test -r $(MKINSTALLDIRS); then \
- $(MKINSTALLDIRS) $(libdir) $(includedir); \
+ $(MKINSTALLDIRS) ${DESTDIR}$(libdir) ${DESTDIR}$(includedir); \
else \
- $(top_srcdir)/mkinstalldirs $(libdir) $(includedir); \
+ $(top_srcdir)/mkinstalldirs ${DESTDIR}$(libdir) ${DESTDIR}$(includedir); \
fi; \
- $(INSTALL_DATA) intlh.inst $(includedir)/libintl.h; \
- $(INSTALL_DATA) libintl.a $(libdir)/libintl.a; \
+ $(INSTALL_DATA) intlh.inst ${DESTDIR}$(includedir)/libintl.h; \
+ $(INSTALL_DATA) libintl.a ${DESTDIR}$(libdir)/libintl.a; \
else \
: ; \
fi
install-data: all
if test "$(PACKAGE)" = "gettext"; then \
if test -r $(MKINSTALLDIRS); then \
- $(MKINSTALLDIRS) $(gettextsrcdir); \
+ $(MKINSTALLDIRS) ${DESTDIR}$(gettextsrcdir); \
else \
- $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \
+ $(top_srcdir)/mkinstalldirs ${DESTDIR}$(gettextsrcdir); \
fi; \
- $(INSTALL_DATA) VERSION $(gettextsrcdir)/VERSION; \
+ $(INSTALL_DATA) VERSION ${DESTDIR}$(gettextsrcdir)/VERSION; \
dists="$(DISTFILES.common)"; \
for file in $$dists; do \
- $(INSTALL_DATA) $(srcdir)/$$file $(gettextsrcdir)/$$file; \
+ $(INSTALL_DATA) $(srcdir)/$$file ${DESTDIR}$(gettextsrcdir)/$$file; \
done; \
else \
: ; \

View file

@ -0,0 +1,35 @@
$NetBSD: patch-ac,v 1.1 2010/02/08 05:18:37 dholland Exp $
DESTDIR support
--- ../binutils-2.12.1/gas/Makefile.am.orig 2002-04-04 16:21:08.000000000 +0000
+++ ../binutils-2.12.1/gas/Makefile.am
@@ -666,21 +666,21 @@ CLEANFILES = dep.sed DEPTC DEPTCA DEPOBJ
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)/'`; \
+ echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p ${DESTDIR}$(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

View file

@ -0,0 +1,35 @@
$NetBSD: patch-ad,v 1.1 2010/02/08 05:18:37 dholland Exp $
DESTDIR support
--- ../binutils-2.12.1/gas/Makefile.in.orig 2002-04-04 16:21:08.000000000 +0000
+++ ../binutils-2.12.1/gas/Makefile.in
@@ -2843,21 +2843,21 @@ cgen.o: cgen.c cgen.h cgen-desc.h subseg
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)/'`; \
+ echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p ${DESTDIR}$(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

View file

@ -0,0 +1,32 @@
$NetBSD: patch-ae,v 1.1 2010/02/08 05:18:37 dholland Exp $
DESTDIR support
--- ../binutils-2.12.1/binutils/Makefile.am.orig 2002-04-04 16:20:11.000000000 +0000
+++ ../binutils-2.12.1/binutils/Makefile.am
@@ -340,19 +340,19 @@ CLEANFILES = dep.sed DEP DEPA DEP1 DEP2
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)/'`; \
+ echo " $(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)/'`"; \
+ $(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); \
+ 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; \

View file

@ -0,0 +1,32 @@
$NetBSD: patch-af,v 1.1 2010/02/08 05:18:37 dholland Exp $
DESTDIR support
--- ../binutils-2.12.1/binutils/Makefile.in.orig 2002-04-04 16:20:11.000000000 +0000
+++ ../binutils-2.12.1/binutils/Makefile.in
@@ -1059,19 +1059,19 @@ mostlyclean-local:
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)/'`; \
+ echo " $(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)/'`"; \
+ $(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); \
+ 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; \

View file

@ -0,0 +1,39 @@
$NetBSD: patch-ag,v 1.1 2010/02/08 05:18:38 dholland Exp $
DESTDIR support
--- ../binutils-2.12.1/ld/Makefile.am.orig 2002-05-09 14:50:49.000000000 +0000
+++ ../binutils-2.12.1/ld/Makefile.am
@@ -1118,24 +1118,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)/'`; \
+ echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p ${DESTDIR}$(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

View file

@ -0,0 +1,39 @@
$NetBSD: patch-ah,v 1.1 2010/02/08 05:18:38 dholland Exp $
DESTDIR support
--- ../binutils-2.12.1/ld/Makefile.in.orig 2002-05-09 14:50:49.000000000 +0000
+++ ../binutils-2.12.1/ld/Makefile.in
@@ -1819,24 +1819,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)/'`; \
+ echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p ${DESTDIR}$(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

View file

@ -0,0 +1,27 @@
$NetBSD: patch-ai,v 1.1 2010/02/08 05:18:38 dholland Exp $
DESTDIR support
--- ../binutils-2.12.1/etc/Makefile.in.orig 2002-01-26 21:35:45.000000000 +0000
+++ ../binutils-2.12.1/etc/Makefile.in
@@ -68,17 +68,17 @@ info:
done
install-info: info
- $(SHELL) $(srcdir)/../mkinstalldirs $(infodir)
+ $(SHELL) $(srcdir)/../mkinstalldirs ${DESTDIR}$(infodir)
if test ! -f standards.info; then cd $(srcdir); fi; \
if test -f standards.info; then \
for i in standards.info*; do \
- $(INSTALL_DATA) $$i $(infodir)/$$i; \
+ $(INSTALL_DATA) $$i ${DESTDIR}$(infodir)/$$i; \
done; \
fi
if test ! -f configure.info; then cd $(srcdir); fi; \
if test -f configure.info; then \
for i in configure.info*; do \
- $(INSTALL_DATA) $$i $(infodir)/$$i; \
+ $(INSTALL_DATA) $$i ${DESTDIR}$(infodir)/$$i; \
done; \
fi

View file

@ -0,0 +1,72 @@
$NetBSD: patch-aj,v 1.1 2010/02/08 05:18:38 dholland Exp $
DESTDIR support
--- ../binutils-2.12.1/bfd/po/Make-in.orig 2001-11-22 16:21:01.000000000 +0000
+++ ../binutils-2.12.1/bfd/po/Make-in
@@ -124,9 +124,9 @@ install-data: install-data-@USE_NLS@
install-data-no: all
install-data-yes: all
if test -r $(MKINSTALLDIRS); then \
- $(MKINSTALLDIRS) $(datadir); \
+ $(MKINSTALLDIRS) ${DESTDIR}$(datadir); \
else \
- $(top_srcdir)/mkinstalldirs $(datadir); \
+ $(top_srcdir)/mkinstalldirs ${DESTDIR}$(datadir); \
fi
@catalogs='$(CATALOGS)'; \
for cat in $$catalogs; do \
@@ -138,27 +138,27 @@ install-data-yes: all
lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
dir=$$destdir/$$lang/LC_MESSAGES; \
if test -r $(MKINSTALLDIRS); then \
- $(MKINSTALLDIRS) $$dir; \
+ $(MKINSTALLDIRS) ${DESTDIR}$$dir; \
else \
- $(top_srcdir)/mkinstalldirs $$dir; \
+ $(top_srcdir)/mkinstalldirs ${DESTDIR}$$dir; \
fi; \
if test -r $$cat; then \
- $(INSTALL_DATA) $$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \
- echo "installing $$cat as $$dir/$(PACKAGE)$(INSTOBJEXT)"; \
+ $(INSTALL_DATA) $$cat ${DESTDIR}$$dir/$(PACKAGE)$(INSTOBJEXT); \
+ echo "installing $$cat as ${DESTDIR}$$dir/$(PACKAGE)$(INSTOBJEXT)"; \
else \
- $(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \
+ $(INSTALL_DATA) $(srcdir)/$$cat ${DESTDIR}$$dir/$(PACKAGE)$(INSTOBJEXT); \
echo "installing $(srcdir)/$$cat as" \
- "$$dir/$(PACKAGE)$(INSTOBJEXT)"; \
+ "${DESTDIR}$$dir/$(PACKAGE)$(INSTOBJEXT)"; \
fi; \
if test -r $$cat.m; then \
- $(INSTALL_DATA) $$cat.m $$dir/$(PACKAGE)$(INSTOBJEXT).m; \
- echo "installing $$cat.m as $$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
+ $(INSTALL_DATA) $$cat.m ${DESTDIR}$$dir/$(PACKAGE)$(INSTOBJEXT).m; \
+ echo "installing $$cat.m as ${DESTDIR}$$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
else \
if test -r $(srcdir)/$$cat.m ; then \
$(INSTALL_DATA) $(srcdir)/$$cat.m \
- $$dir/$(PACKAGE)$(INSTOBJEXT).m; \
+ ${DESTDIR}$$dir/$(PACKAGE)$(INSTOBJEXT).m; \
echo "installing $(srcdir)/$$cat as" \
- "$$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
+ "${DESTDIR}$$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
else \
true; \
fi; \
@@ -166,12 +166,12 @@ install-data-yes: all
done
if test "$(PACKAGE)" = "gettext"; then \
if test -r $(MKINSTALLDIRS); then \
- $(MKINSTALLDIRS) $(gettextsrcdir); \
+ $(MKINSTALLDIRS) ${DESTDIR}$(gettextsrcdir); \
else \
- $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \
+ $(top_srcdir)/mkinstalldirs ${DESTDIR}$(gettextsrcdir); \
fi; \
$(INSTALL_DATA) $(srcdir)/Makefile.in.in \
- $(gettextsrcdir)/Makefile.in.in; \
+ ${DESTDIR}$(gettextsrcdir)/Makefile.in.in; \
else \
: ; \
fi

View file

@ -0,0 +1,72 @@
$NetBSD: patch-ak,v 1.1 2010/02/08 05:18:38 dholland Exp $
DESTDIR support
--- ../binutils-2.12.1/opcodes/po/Make-in.orig 1999-05-03 07:29:01.000000000 +0000
+++ ../binutils-2.12.1/opcodes/po/Make-in
@@ -111,9 +111,9 @@ install-data: install-data-@USE_NLS@
install-data-no: all
install-data-yes: all
if test -r $(MKINSTALLDIRS); then \
- $(MKINSTALLDIRS) $(datadir); \
+ $(MKINSTALLDIRS) ${DESTDIR}$(datadir); \
else \
- $(top_srcdir)/mkinstalldirs $(datadir); \
+ $(top_srcdir)/mkinstalldirs ${DESTDIR}$(datadir); \
fi
@catalogs='$(CATALOGS)'; \
for cat in $$catalogs; do \
@@ -125,27 +125,27 @@ install-data-yes: all
lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
dir=$$destdir/$$lang/LC_MESSAGES; \
if test -r $(MKINSTALLDIRS); then \
- $(MKINSTALLDIRS) $$dir; \
+ $(MKINSTALLDIRS) ${DESTDIR}$$dir; \
else \
- $(top_srcdir)/mkinstalldirs $$dir; \
+ $(top_srcdir)/mkinstalldirs ${DESTDIR}$$dir; \
fi; \
if test -r $$cat; then \
- $(INSTALL_DATA) $$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \
- echo "installing $$cat as $$dir/$(PACKAGE)$(INSTOBJEXT)"; \
+ $(INSTALL_DATA) $$cat ${DESTDIR}$$dir/$(PACKAGE)$(INSTOBJEXT); \
+ echo "installing $$cat as ${DESTDIR}$$dir/$(PACKAGE)$(INSTOBJEXT)"; \
else \
- $(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \
+ $(INSTALL_DATA) $(srcdir)/$$cat ${DESTDIR}$$dir/$(PACKAGE)$(INSTOBJEXT); \
echo "installing $(srcdir)/$$cat as" \
- "$$dir/$(PACKAGE)$(INSTOBJEXT)"; \
+ "${DESTDIR}$$dir/$(PACKAGE)$(INSTOBJEXT)"; \
fi; \
if test -r $$cat.m; then \
- $(INSTALL_DATA) $$cat.m $$dir/$(PACKAGE)$(INSTOBJEXT).m; \
- echo "installing $$cat.m as $$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
+ $(INSTALL_DATA) $$cat.m ${DESTDIR}$$dir/$(PACKAGE)$(INSTOBJEXT).m; \
+ echo "installing $$cat.m as ${DESTDIR}$$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
else \
if test -r $(srcdir)/$$cat.m ; then \
$(INSTALL_DATA) $(srcdir)/$$cat.m \
- $$dir/$(PACKAGE)$(INSTOBJEXT).m; \
+ ${DESTDIR}$$dir/$(PACKAGE)$(INSTOBJEXT).m; \
echo "installing $(srcdir)/$$cat as" \
- "$$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
+ "${DESTDIR}$$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
else \
true; \
fi; \
@@ -153,12 +153,12 @@ install-data-yes: all
done
if test "$(PACKAGE)" = "gettext"; then \
if test -r $(MKINSTALLDIRS); then \
- $(MKINSTALLDIRS) $(gettextsrcdir); \
+ $(MKINSTALLDIRS) ${DESTDIR}$(gettextsrcdir); \
else \
- $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \
+ $(top_srcdir)/mkinstalldirs ${DESTDIR}$(gettextsrcdir); \
fi; \
$(INSTALL_DATA) $(srcdir)/Makefile.in.in \
- $(gettextsrcdir)/Makefile.in.in; \
+ ${DESTDIR}$(gettextsrcdir)/Makefile.in.in; \
else \
: ; \
fi

View file

@ -0,0 +1,72 @@
$NetBSD: patch-al,v 1.1 2010/02/08 05:18:38 dholland Exp $
DESTDIR support
--- ../binutils-2.12.1/binutils/po/Make-in.orig 1999-05-03 07:29:10.000000000 +0000
+++ ../binutils-2.12.1/binutils/po/Make-in
@@ -111,9 +111,9 @@ install-data: install-data-@USE_NLS@
install-data-no: all
install-data-yes: all
if test -r $(MKINSTALLDIRS); then \
- $(MKINSTALLDIRS) $(datadir); \
+ $(MKINSTALLDIRS) ${DESTDIR}$(datadir); \
else \
- $(top_srcdir)/mkinstalldirs $(datadir); \
+ $(top_srcdir)/mkinstalldirs ${DESTDIR}$(datadir); \
fi
@catalogs='$(CATALOGS)'; \
for cat in $$catalogs; do \
@@ -125,27 +125,27 @@ install-data-yes: all
lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
dir=$$destdir/$$lang/LC_MESSAGES; \
if test -r $(MKINSTALLDIRS); then \
- $(MKINSTALLDIRS) $$dir; \
+ $(MKINSTALLDIRS) ${DESTDIR}$$dir; \
else \
- $(top_srcdir)/mkinstalldirs $$dir; \
+ $(top_srcdir)/mkinstalldirs ${DESTDIR}$$dir; \
fi; \
if test -r $$cat; then \
- $(INSTALL_DATA) $$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \
- echo "installing $$cat as $$dir/$(PACKAGE)$(INSTOBJEXT)"; \
+ $(INSTALL_DATA) $$cat ${DESTDIR}$$dir/$(PACKAGE)$(INSTOBJEXT); \
+ echo "installing $$cat as ${DESTDIR}$$dir/$(PACKAGE)$(INSTOBJEXT)"; \
else \
- $(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \
+ $(INSTALL_DATA) $(srcdir)/$$cat ${DESTDIR}$$dir/$(PACKAGE)$(INSTOBJEXT); \
echo "installing $(srcdir)/$$cat as" \
- "$$dir/$(PACKAGE)$(INSTOBJEXT)"; \
+ "${DESTDIR}$$dir/$(PACKAGE)$(INSTOBJEXT)"; \
fi; \
if test -r $$cat.m; then \
- $(INSTALL_DATA) $$cat.m $$dir/$(PACKAGE)$(INSTOBJEXT).m; \
- echo "installing $$cat.m as $$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
+ $(INSTALL_DATA) $$cat.m ${DESTDIR}$$dir/$(PACKAGE)$(INSTOBJEXT).m; \
+ echo "installing $$cat.m as ${DESTDIR}$$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
else \
if test -r $(srcdir)/$$cat.m ; then \
$(INSTALL_DATA) $(srcdir)/$$cat.m \
- $$dir/$(PACKAGE)$(INSTOBJEXT).m; \
+ ${DESTDIR}$$dir/$(PACKAGE)$(INSTOBJEXT).m; \
echo "installing $(srcdir)/$$cat as" \
- "$$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
+ "${DESTDIR}$$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
else \
true; \
fi; \
@@ -153,12 +153,12 @@ install-data-yes: all
done
if test "$(PACKAGE)" = "gettext"; then \
if test -r $(MKINSTALLDIRS); then \
- $(MKINSTALLDIRS) $(gettextsrcdir); \
+ $(MKINSTALLDIRS) ${DESTDIR}$(gettextsrcdir); \
else \
- $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \
+ $(top_srcdir)/mkinstalldirs ${DESTDIR}$(gettextsrcdir); \
fi; \
$(INSTALL_DATA) $(srcdir)/Makefile.in.in \
- $(gettextsrcdir)/Makefile.in.in; \
+ ${DESTDIR}$(gettextsrcdir)/Makefile.in.in; \
else \
: ; \
fi

View file

@ -0,0 +1,72 @@
$NetBSD: patch-am,v 1.1 2010/02/08 05:18:38 dholland Exp $
DESTDIR support
--- ../binutils-2.12.1/gas/po/Make-in.orig 1999-05-03 07:28:45.000000000 +0000
+++ ../binutils-2.12.1/gas/po/Make-in
@@ -111,9 +111,9 @@ install-data: install-data-@USE_NLS@
install-data-no: all
install-data-yes: all
if test -r $(MKINSTALLDIRS); then \
- $(MKINSTALLDIRS) $(datadir); \
+ $(MKINSTALLDIRS) ${DESTDIR}$(datadir); \
else \
- $(top_srcdir)/mkinstalldirs $(datadir); \
+ $(top_srcdir)/mkinstalldirs ${DESTDIR}$(datadir); \
fi
@catalogs='$(CATALOGS)'; \
for cat in $$catalogs; do \
@@ -125,27 +125,27 @@ install-data-yes: all
lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
dir=$$destdir/$$lang/LC_MESSAGES; \
if test -r $(MKINSTALLDIRS); then \
- $(MKINSTALLDIRS) $$dir; \
+ $(MKINSTALLDIRS) ${DESTDIR}$$dir; \
else \
- $(top_srcdir)/mkinstalldirs $$dir; \
+ $(top_srcdir)/mkinstalldirs ${DESTDIR}$$dir; \
fi; \
if test -r $$cat; then \
- $(INSTALL_DATA) $$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \
- echo "installing $$cat as $$dir/$(PACKAGE)$(INSTOBJEXT)"; \
+ $(INSTALL_DATA) $$cat ${DESTDIR}$$dir/$(PACKAGE)$(INSTOBJEXT); \
+ echo "installing $$cat as ${DESTDIR}$$dir/$(PACKAGE)$(INSTOBJEXT)"; \
else \
- $(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \
+ $(INSTALL_DATA) $(srcdir)/$$cat ${DESTDIR}$$dir/$(PACKAGE)$(INSTOBJEXT); \
echo "installing $(srcdir)/$$cat as" \
- "$$dir/$(PACKAGE)$(INSTOBJEXT)"; \
+ "${DESTDIR}$$dir/$(PACKAGE)$(INSTOBJEXT)"; \
fi; \
if test -r $$cat.m; then \
- $(INSTALL_DATA) $$cat.m $$dir/$(PACKAGE)$(INSTOBJEXT).m; \
- echo "installing $$cat.m as $$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
+ $(INSTALL_DATA) $$cat.m ${DESTDIR}$$dir/$(PACKAGE)$(INSTOBJEXT).m; \
+ echo "installing $$cat.m as ${DESTDIR}$$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
else \
if test -r $(srcdir)/$$cat.m ; then \
$(INSTALL_DATA) $(srcdir)/$$cat.m \
- $$dir/$(PACKAGE)$(INSTOBJEXT).m; \
+ ${DESTDIR}$$dir/$(PACKAGE)$(INSTOBJEXT).m; \
echo "installing $(srcdir)/$$cat as" \
- "$$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
+ "${DESTDIR}$$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
else \
true; \
fi; \
@@ -153,12 +153,12 @@ install-data-yes: all
done
if test "$(PACKAGE)" = "gettext"; then \
if test -r $(MKINSTALLDIRS); then \
- $(MKINSTALLDIRS) $(gettextsrcdir); \
+ $(MKINSTALLDIRS) ${DESTDIR}$(gettextsrcdir); \
else \
- $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \
+ $(top_srcdir)/mkinstalldirs ${DESTDIR}$(gettextsrcdir); \
fi; \
$(INSTALL_DATA) $(srcdir)/Makefile.in.in \
- $(gettextsrcdir)/Makefile.in.in; \
+ ${DESTDIR}$(gettextsrcdir)/Makefile.in.in; \
else \
: ; \
fi

View file

@ -0,0 +1,72 @@
$NetBSD: patch-an,v 1.1 2010/02/08 05:18:38 dholland Exp $
DESTDIR support
--- ../binutils-2.12.1/gprof/po/Make-in.orig 1999-05-03 07:29:11.000000000 +0000
+++ ../binutils-2.12.1/gprof/po/Make-in
@@ -111,9 +111,9 @@ install-data: install-data-@USE_NLS@
install-data-no: all
install-data-yes: all
if test -r $(MKINSTALLDIRS); then \
- $(MKINSTALLDIRS) $(datadir); \
+ $(MKINSTALLDIRS) ${DESTDIR}$(datadir); \
else \
- $(top_srcdir)/mkinstalldirs $(datadir); \
+ $(top_srcdir)/mkinstalldirs ${DESTDIR}$(datadir); \
fi
@catalogs='$(CATALOGS)'; \
for cat in $$catalogs; do \
@@ -125,27 +125,27 @@ install-data-yes: all
lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
dir=$$destdir/$$lang/LC_MESSAGES; \
if test -r $(MKINSTALLDIRS); then \
- $(MKINSTALLDIRS) $$dir; \
+ $(MKINSTALLDIRS) ${DESTDIR}$$dir; \
else \
- $(top_srcdir)/mkinstalldirs $$dir; \
+ $(top_srcdir)/mkinstalldirs ${DESTDIR}$$dir; \
fi; \
if test -r $$cat; then \
- $(INSTALL_DATA) $$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \
- echo "installing $$cat as $$dir/$(PACKAGE)$(INSTOBJEXT)"; \
+ $(INSTALL_DATA) $$cat ${DESTDIR}$$dir/$(PACKAGE)$(INSTOBJEXT); \
+ echo "installing $$cat as ${DESTDIR}$$dir/$(PACKAGE)$(INSTOBJEXT)"; \
else \
- $(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \
+ $(INSTALL_DATA) $(srcdir)/$$cat ${DESTDIR}$$dir/$(PACKAGE)$(INSTOBJEXT); \
echo "installing $(srcdir)/$$cat as" \
- "$$dir/$(PACKAGE)$(INSTOBJEXT)"; \
+ "${DESTDIR}$$dir/$(PACKAGE)$(INSTOBJEXT)"; \
fi; \
if test -r $$cat.m; then \
- $(INSTALL_DATA) $$cat.m $$dir/$(PACKAGE)$(INSTOBJEXT).m; \
- echo "installing $$cat.m as $$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
+ $(INSTALL_DATA) $$cat.m ${DESTDIR}$$dir/$(PACKAGE)$(INSTOBJEXT).m; \
+ echo "installing $$cat.m as ${DESTDIR}$$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
else \
if test -r $(srcdir)/$$cat.m ; then \
$(INSTALL_DATA) $(srcdir)/$$cat.m \
- $$dir/$(PACKAGE)$(INSTOBJEXT).m; \
+ ${DESTDIR}$$dir/$(PACKAGE)$(INSTOBJEXT).m; \
echo "installing $(srcdir)/$$cat as" \
- "$$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
+ "${DESTDIR}$$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
else \
true; \
fi; \
@@ -153,12 +153,12 @@ install-data-yes: all
done
if test "$(PACKAGE)" = "gettext"; then \
if test -r $(MKINSTALLDIRS); then \
- $(MKINSTALLDIRS) $(gettextsrcdir); \
+ $(MKINSTALLDIRS) ${DESTDIR}$(gettextsrcdir); \
else \
- $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \
+ $(top_srcdir)/mkinstalldirs ${DESTDIR}$(gettextsrcdir); \
fi; \
$(INSTALL_DATA) $(srcdir)/Makefile.in.in \
- $(gettextsrcdir)/Makefile.in.in; \
+ ${DESTDIR}$(gettextsrcdir)/Makefile.in.in; \
else \
: ; \
fi

View file

@ -0,0 +1,72 @@
$NetBSD: patch-ao,v 1.1 2010/02/08 05:18:38 dholland Exp $
DESTDIR support
--- ../binutils-2.12.1/ld/po/Make-in.orig 1999-05-03 07:29:07.000000000 +0000
+++ ../binutils-2.12.1/ld/po/Make-in
@@ -111,9 +111,9 @@ install-data: install-data-@USE_NLS@
install-data-no: all
install-data-yes: all
if test -r $(MKINSTALLDIRS); then \
- $(MKINSTALLDIRS) $(datadir); \
+ $(MKINSTALLDIRS) ${DESTDIR}$(datadir); \
else \
- $(top_srcdir)/mkinstalldirs $(datadir); \
+ $(top_srcdir)/mkinstalldirs ${DESTDIR}$(datadir); \
fi
@catalogs='$(CATALOGS)'; \
for cat in $$catalogs; do \
@@ -125,27 +125,27 @@ install-data-yes: all
lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
dir=$$destdir/$$lang/LC_MESSAGES; \
if test -r $(MKINSTALLDIRS); then \
- $(MKINSTALLDIRS) $$dir; \
+ $(MKINSTALLDIRS) ${DESTDIR}$$dir; \
else \
- $(top_srcdir)/mkinstalldirs $$dir; \
+ $(top_srcdir)/mkinstalldirs ${DESTDIR}$$dir; \
fi; \
if test -r $$cat; then \
- $(INSTALL_DATA) $$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \
- echo "installing $$cat as $$dir/$(PACKAGE)$(INSTOBJEXT)"; \
+ $(INSTALL_DATA) $$cat ${DESTDIR}$$dir/$(PACKAGE)$(INSTOBJEXT); \
+ echo "installing $$cat as ${DESTDIR}$$dir/$(PACKAGE)$(INSTOBJEXT)"; \
else \
- $(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \
+ $(INSTALL_DATA) $(srcdir)/$$cat ${DESTDIR}$$dir/$(PACKAGE)$(INSTOBJEXT); \
echo "installing $(srcdir)/$$cat as" \
- "$$dir/$(PACKAGE)$(INSTOBJEXT)"; \
+ "${DESTDIR}$$dir/$(PACKAGE)$(INSTOBJEXT)"; \
fi; \
if test -r $$cat.m; then \
- $(INSTALL_DATA) $$cat.m $$dir/$(PACKAGE)$(INSTOBJEXT).m; \
- echo "installing $$cat.m as $$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
+ $(INSTALL_DATA) $$cat.m ${DESTDIR}$$dir/$(PACKAGE)$(INSTOBJEXT).m; \
+ echo "installing $$cat.m as ${DESTDIR}$$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
else \
if test -r $(srcdir)/$$cat.m ; then \
$(INSTALL_DATA) $(srcdir)/$$cat.m \
- $$dir/$(PACKAGE)$(INSTOBJEXT).m; \
+ ${DESTDIR}$$dir/$(PACKAGE)$(INSTOBJEXT).m; \
echo "installing $(srcdir)/$$cat as" \
- "$$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
+ "${DESTDIR}$$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
else \
true; \
fi; \
@@ -153,12 +153,12 @@ install-data-yes: all
done
if test "$(PACKAGE)" = "gettext"; then \
if test -r $(MKINSTALLDIRS); then \
- $(MKINSTALLDIRS) $(gettextsrcdir); \
+ $(MKINSTALLDIRS) ${DESTDIR}$(gettextsrcdir); \
else \
- $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \
+ $(top_srcdir)/mkinstalldirs ${DESTDIR}$(gettextsrcdir); \
fi; \
$(INSTALL_DATA) $(srcdir)/Makefile.in.in \
- $(gettextsrcdir)/Makefile.in.in; \
+ ${DESTDIR}$(gettextsrcdir)/Makefile.in.in; \
else \
: ; \
fi

View file

@ -0,0 +1,28 @@
$NetBSD: patch-ap,v 1.1 2010/02/08 05:18:38 dholland Exp $
DESTDIR support.
--- ../binutils-2.12.1/libiberty/Makefile.in~ 2002-01-22 20:14:52.000000000 +0000
+++ ../binutils-2.12.1/libiberty/Makefile.in
@@ -237,15 +237,15 @@ INSTALL_DEST = @INSTALL_DEST@
install: install_to_$(INSTALL_DEST) install-subdir
install_to_libdir: all
- $(INSTALL_DATA) $(TARGETLIB) $(libdir)$(MULTISUBDIR)/$(TARGETLIB)n
- ( cd $(libdir)$(MULTISUBDIR) ; $(RANLIB) $(TARGETLIB)n )
- mv -f $(libdir)$(MULTISUBDIR)/$(TARGETLIB)n $(libdir)$(MULTISUBDIR)/$(TARGETLIB)
+ $(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(libdir)$(MULTISUBDIR)/$(TARGETLIB)n
+ ( cd $(DESTDIR)$(libdir)$(MULTISUBDIR) ; $(RANLIB) $(TARGETLIB)n )
+ mv -f $(DESTDIR)$(libdir)$(MULTISUBDIR)/$(TARGETLIB)n $(DESTDIR)$(libdir)$(MULTISUBDIR)/$(TARGETLIB)
@$(MULTIDO) $(FLAGS_TO_PASS) multi-do DO=install
install_to_tooldir: all
- $(INSTALL_DATA) $(TARGETLIB) $(tooldir)/lib$(MULTISUBDIR)/$(TARGETLIB)n
- ( cd $(tooldir)/lib$(MULTISUBDIR) ; $(RANLIB) $(TARGETLIB)n )
- mv -f $(tooldir)/lib$(MULTISUBDIR)/$(TARGETLIB)n $(tooldir)/lib$(MULTISUBDIR)/$(TARGETLIB)
+ $(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(tooldir)/lib$(MULTISUBDIR)/$(TARGETLIB)n
+ ( cd $(DESTDIR)$(tooldir)/lib$(MULTISUBDIR) ; $(RANLIB) $(TARGETLIB)n )
+ mv -f $(DESTDIR)$(tooldir)/lib$(MULTISUBDIR)/$(TARGETLIB)n $(DESTDIR)$(tooldir)/lib$(MULTISUBDIR)/$(TARGETLIB)
@$(MULTIDO) $(FLAGS_TO_PASS) multi-do DO=install
# needed-list is used by libstdc++. NEEDED is the list of functions