From 3b9a5f5e2a27fe4284e73f224e38ccd17402d417 Mon Sep 17 00:00:00 2001
From: grant <grant@pkgsrc.org>
Date: Wed, 23 Jul 2003 22:30:12 +0000
Subject: fix GCC_VERSION so GCC_ARCHDIR is correctly set.

re-arrange gcc/Makefile a bit to more closely resemble gcc3/Makefile.
---
 lang/gcc/Makefile | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'lang/gcc')

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}
-- 
cgit v1.2.3