diff options
| author | dmcmahill <dmcmahill@pkgsrc.org> | 2009-09-25 02:48:08 +0000 |
|---|---|---|
| committer | dmcmahill <dmcmahill@pkgsrc.org> | 2009-09-25 02:48:08 +0000 |
| commit | 9dd20411ee8e136f7e589db5bf88c865aa28200c (patch) | |
| tree | 3c9768d2db228fc502752e9110b731964b3bd3e4 /lang/gcc44 | |
| parent | 46d2afa561c5fbc32352150b812964b3437d6125 (diff) | |
| download | pkgsrc-9dd20411ee8e136f7e589db5bf88c865aa28200c.tar.gz | |
Fix DESTDIR builds. There were PLIST and rpath problems. Noted by Thomas
Klausner.
Diffstat (limited to 'lang/gcc44')
| -rw-r--r-- | lang/gcc44/Makefile | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lang/gcc44/Makefile b/lang/gcc44/Makefile index 1b5f9736463..59944eb7e4e 100644 --- a/lang/gcc44/Makefile +++ b/lang/gcc44/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.7 2009/09/24 13:04:16 tnn Exp $ +# $NetBSD: Makefile,v 1.8 2009/09/25 02:48:08 dmcmahill Exp $ # DISTNAME= gcc-${GCC_VERSION} PKGNAME= gcc44-${GCC_VERSION} -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC_VERSION}/} EXTRACT_SUFX= .tar.bz2 @@ -24,7 +24,7 @@ DEPENDS+= zip-[0-9]*:../../archivers/zip GCC_VERSION= 4.4.1 GCC_SUBPREFIX= gcc44 -GCC_PREFIX= ${DESTDIR}${PREFIX}/${GCC_SUBPREFIX} +GCC_PREFIX= ${PREFIX}/${GCC_SUBPREFIX} FILES_SUBST+= PKGNAME=${PKGNAME:Q} MESSAGE_SUBST+= GCC_PREFIX=${GCC_PREFIX} @@ -162,12 +162,12 @@ do-test: (cd ${WRKDIR}/obj && ${GMAKE} -k check) do-install: - (cd ${WRKDIR}/obj && ${SETENV} ${MAKE_ENV} ${GMAKE} install \ - && ${TEST} -f ${GCC_PREFIX}/bin/cc || ${LN} -f ${GCC_PREFIX}/bin/gcc ${GCC_PREFIX}/bin/cc) + (cd ${WRKDIR}/obj && ${SETENV} ${MAKE_ENV} ${GMAKE} install DESTDIR=${DESTDIR:Q} \ + && ${TEST} -f ${DESTDIR}${GCC_PREFIX}/bin/cc || ${LN} -f ${DESTDIR}${GCC_PREFIX}/bin/gcc ${DESTDIR}${GCC_PREFIX}/bin/cc) GENERATE_PLIST+= \ - ${FIND} ${GCC_PREFIX} \( -type f -o -type l \) -print \ - | ${SORT} | ${SED} -e "s,${PREFIX}/,,g"; + cd ${DESTDIR}${PREFIX} && ${FIND} ${GCC_SUBPREFIX} \( -type f -o -type l \) -print \ + | ${SORT} ; .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" |