diff options
| author | grant <grant> | 2003-07-23 22:30:12 +0000 |
|---|---|---|
| committer | grant <grant> | 2003-07-23 22:30:12 +0000 |
| commit | 3016ebabfeea442dbcd9b3d832d8de2dd80253fa (patch) | |
| tree | cdabea7be19660a4a40b74a115b594828fbc5641 | |
| parent | e0355bb4018dbbff90a10fb8194029ba603e46ab (diff) | |
| download | pkgsrc-3016ebabfeea442dbcd9b3d832d8de2dd80253fa.tar.gz | |
fix GCC_VERSION so GCC_ARCHDIR is correctly set.
re-arrange gcc/Makefile a bit to more closely resemble gcc3/Makefile.
| -rw-r--r-- | lang/gcc/Makefile | 17 | ||||
| -rw-r--r-- | lang/gcc3/Makefile | 5 |
2 files changed, 10 insertions, 12 deletions
diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile index bab3b596596..dbb88b14f56 100644 --- a/lang/gcc/Makefile +++ b/lang/gcc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.69 2003/07/17 21:44:23 grant Exp $ +# $NetBSD: Makefile,v 1.70 2003/07/23 22:30:12 grant Exp $ DISTNAME= gcc-2.95.3 PKGREVISION= 4 @@ -30,15 +30,16 @@ CONFIGURE_ARGS+= --enable-shared CONFIGURE_DIRS= ${WRKDIR}/objdir BUILD_DIRS= ${CONFIGURE_DIRS} +FILES_SUBST+= DISTNAME=${DISTNAME} GCC_PREFIX=${GCC_PREFIX} +MESSAGE_SUBST+= DISTNAME=${DISTNAME} +PLIST_SUBST+= DISTNAME=${DISTNAME} + USE_NEW_TEXINFO= YES INFO_DIR= ${GCC_PREFIX:S|^${PREFIX}/||}/info INFO_FILES= chill.info cpp.info g77.info gcc.info .include "../../mk/bsd.prefs.mk" -GCC_PREFIX= ${PREFIX}/${PKGNAME_NOREV} -PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC - .if ${OPSYS} == "SunOS" CONFLICTS+= gcc-[0-9]* pgcc-[0-9]* . if ${CC:M*gcc*} == "" @@ -56,12 +57,10 @@ ALL_TARGET= bootstrap . endif .endif -GCC_VERSION= ${PKGVERSION:C|nb*||} +GCC_PREFIX= ${PREFIX}/${DISTNAME} +GCC_VERSION= ${PKGVERSION:C|nb.*||} GCC_ARCHDIR= ${GCC_PREFIX}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION} -FILES_SUBST+= GCC_PREFIX=${GCC_PREFIX} -FILES_SUBST+= DISTNAME=${DISTNAME} -MESSAGE_SUBST+= DISTNAME=${DISTNAME} -PLIST_SUBST+= DISTNAME=${DISTNAME} +PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC post-extract: ${MKDIR} ${WRKSRC} diff --git a/lang/gcc3/Makefile b/lang/gcc3/Makefile index 43e7d471a68..cbd1e5e2062 100644 --- a/lang/gcc3/Makefile +++ b/lang/gcc3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2003/07/17 21:44:26 grant Exp $ +# $NetBSD: Makefile,v 1.41 2003/07/23 22:30:13 grant Exp $ # DISTNAME= gcc-3.3 @@ -82,9 +82,8 @@ ALL_TARGET= bootstrap . endif .endif -# as this is named gcc3, use DISTNAME instead. GCC_PREFIX= ${PREFIX}/${DISTNAME} -GCC_VERSION= ${PKGVERSION:C|nb*||} +GCC_VERSION= ${PKGVERSION:C|nb.*||} GCC_ARCHDIR= ${GCC_PREFIX}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION} PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC |