diff options
| author | sbd <sbd@pkgsrc.org> | 2011-08-26 02:57:13 +0000 |
|---|---|---|
| committer | sbd <sbd@pkgsrc.org> | 2011-08-26 02:57:13 +0000 |
| commit | 07b9ce4eb0dce86afcdf11de8e5b6cd0533688fa (patch) | |
| tree | c5dc779fb9a19f5045d9f34a790b2809c0cbf580 /lang/gcc34 | |
| parent | b4d7a2d98e84e6d012e412c8c8061fd97ec8b8f4 (diff) | |
| download | pkgsrc-07b9ce4eb0dce86afcdf11de8e5b6cd0533688fa.tar.gz | |
Do DESTDIR support The Right Way(tm) by passing ${INSTALL_ENV} to
the 'make install' process and _not_ using MAKEFLAGS.
Should fix PR pkg/45290
Diffstat (limited to 'lang/gcc34')
| -rw-r--r-- | lang/gcc34/Makefile | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lang/gcc34/Makefile b/lang/gcc34/Makefile index 33f9c475912..b4a59c5ceb3 100644 --- a/lang/gcc34/Makefile +++ b/lang/gcc34/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.48 2011/06/03 08:32:30 wiz Exp $ +# $NetBSD: Makefile,v 1.49 2011/08/26 02:57:13 sbd Exp $ # DISTNAME= gcc-${GCC_VERSION} @@ -52,7 +52,6 @@ CONFIGURE_ARGS+= --with-ld=${LOCALBASE}/bin/ld CONFIGURE_ARGS+= --with-gnu-as CONFIGURE_ARGS+= --with-gnu-ld .endif -MAKEFLAGS+= DESTDIR=${DESTDIR} REPLACE_AWK+= libjava/addr2name.awk USE_TOOLS+= awk:run @@ -230,7 +229,7 @@ do-test: (cd ${WRKDIR}/obj && ${GMAKE} -k check) do-install: - (cd ${WRKDIR}/obj && ${SETENV} ${MAKE_ENV} ${GMAKE} install \ + (cd ${WRKDIR}/obj && ${SETENV} ${INSTALL_ENV} ${MAKE_ENV} ${GMAKE} install \ && ${TEST} -f ${GCC_PREFIX}/bin/cc || ${LN} -f ${DESTDIR}${GCC_PREFIX}/bin/gcc ${DESTDIR}${GCC_PREFIX}/bin/cc) .if !empty(BUILD_ADA:M[Yy][Ee][Ss]) (SPECPATH=`${GCC_PREFIX}/bin/gcc -print-file-name=specs` && \ |