elaborate the INSTALLTO_SUBPREFIX thing a bit more: modify the

PKGNAME if we are installing to an alternative location so that the
pkg system doesn't complain about conflicts.
Now it is possible to install a gcc3 tree to some location where
it can be used to bootstrap another instance of itself...

8 files changed, 19 insertions, 16 deletions

diff --git a/lang/gcc3-ada/Makefile b/lang/gcc3-ada/Makefile
index ccff0da7709..caf1c341d26 100644
--- a/lang/gcc3-ada/Makefile
+++ b/lang/gcc3-ada/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2003/07/08 15:04:53 drochner Exp $
+# $NetBSD: Makefile,v 1.4 2003/07/16 20:23:58 drochner Exp $
 #
 
-PKGNAME=		gcc3-ada-3.3
+PKGNAME=		gcc3${GCC3_PKGMODIF}-ada-3.3
 COMMENT=		GNU Compiler Collection, Ada compiler
 
 INFO_FILES=	gnat_ug_unx.info gnat_ug_vms.info gnat_ug_vxw.info
diff --git a/lang/gcc3-c++/Makefile b/lang/gcc3-c++/Makefile
index a9030a58175..d6db0a8f95b 100644
--- a/lang/gcc3-c++/Makefile
+++ b/lang/gcc3-c++/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2003/07/08 15:04:59 drochner Exp $
+# $NetBSD: Makefile,v 1.4 2003/07/16 20:23:59 drochner Exp $
 #
 
-PKGNAME=		gcc3-c++-3.3
+PKGNAME=		gcc3${GCC3_PKGMODIF}-c++-3.3
 COMMENT=		GNU Compiler Collection, c++ Compiler
 
 .include "../gcc3-c/buildaddon.mk"
diff --git a/lang/gcc3-c/Makefile b/lang/gcc3-c/Makefile
index 49159030948..453c16fcdad 100644
--- a/lang/gcc3-c/Makefile
+++ b/lang/gcc3-c/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2003/07/08 15:04:56 drochner Exp $
+# $NetBSD: Makefile,v 1.4 2003/07/16 20:23:59 drochner Exp $
 #
 
-PKGNAME=		gcc3-c-${GCC_VERSION}
+PKGNAME=		gcc3${GCC3_PKGMODIF}-c-${GCC_VERSION}
 COMMENT=		GNU Compiler Collection, C compiler
 
 INFO_FILES=	cpp.info gcc.info gccint.info cppinternals.info
diff --git a/lang/gcc3-c/Makefile.common b/lang/gcc3-c/Makefile.common
index cf03785fa27..716b0e4b772 100644
--- a/lang/gcc3-c/Makefile.common
+++ b/lang/gcc3-c/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2003/07/08 16:39:51 seb Exp $
+# $NetBSD: Makefile.common,v 1.3 2003/07/16 20:23:59 drochner Exp $
 #
 
 GCC_VERSION=	3.3
@@ -22,6 +22,9 @@ HAS_CONFIGURE=		YES
 # Make location overridable, to allow ping-pong bootstraps.
 GCC3_DEFAULT_SUBPREFIX=	gcc3
 GCC3_INSTALLTO_SUBPREFIX?=	${GCC3_DEFAULT_SUBPREFIX}
+.if ${GCC3_INSTALLTO_SUBPREFIX} != ${GCC3_DEFAULT_SUBPREFIX}
+GCC3_PKGMODIF=		_${GCC3_INSTALLTO_SUBPREFIX}
+.endif
 
 GCC_SUBPREFIX=		${GCC3_INSTALLTO_SUBPREFIX}
 GCC_PREFIX=		${PREFIX}/${GCC_SUBPREFIX}
diff --git a/lang/gcc3-c/buildaddon.mk b/lang/gcc3-c/buildaddon.mk
index 01ed5346c11..d2d41be776e 100644
--- a/lang/gcc3-c/buildaddon.mk
+++ b/lang/gcc3-c/buildaddon.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildaddon.mk,v 1.2 2003/07/09 15:11:21 drochner Exp $
+# $NetBSD: buildaddon.mk,v 1.3 2003/07/16 20:23:59 drochner Exp $
 
 .include "../../lang/gcc3-c/Makefile.common"
 
@@ -7,7 +7,7 @@ pre-build:
 	${LN} -sf ${GCC_PREFIX}/lib/libiberty.a ${WRKSRC}/libiberty
 	${LN} -sf ${GCC_PREFIX}/bin/gcc ${WRKSRC}/gcc/xgcc
 
-BUILDLINK_DEPENDS.gcc3c?=	gcc3-c-3.3
+BUILDLINK_DEPENDS.gcc3c?=	gcc3${GCC3_PKGMODIF}-c-3.3
 BUILDLINK_PKGSRCDIR.gcc3c?=	../../lang/gcc3-c
 
 BUILDLINK_PREFIX.gcc3c=	${LOCALBASE}
diff --git a/lang/gcc3-f77/Makefile b/lang/gcc3-f77/Makefile
index b7acda1eed4..231bc5bb756 100644
--- a/lang/gcc3-f77/Makefile
+++ b/lang/gcc3-f77/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2003/07/08 15:05:00 drochner Exp $
+# $NetBSD: Makefile,v 1.4 2003/07/16 20:23:59 drochner Exp $
 #
 
-PKGNAME=		gcc3-f77-3.3
+PKGNAME=		gcc3${GCC3_PKGMODIF}-f77-3.3
 COMMENT=		GNU Compiler Collection, f77 Compiler
 
 INFO_FILES=		g77.info
diff --git a/lang/gcc3-java/Makefile b/lang/gcc3-java/Makefile
index 263406df3f5..b19558bb8d2 100644
--- a/lang/gcc3-java/Makefile
+++ b/lang/gcc3-java/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.3 2003/07/08 15:05:02 drochner Exp $
+# $NetBSD: Makefile,v 1.4 2003/07/16 20:24:00 drochner Exp $
 #
 
-PKGNAME=		gcc3-java-3.3
+PKGNAME=		gcc3${GCC3_PKGMODIF}-java-3.3
 COMMENT=		GNU Compiler Collection, Java compiler
 
 INFO_FILES=		gcj.info
 
 .include "../../lang/gcc3-c/buildaddon.mk"
 
-BUILD_DEPENDS+=		gcc3-c++-3.3:../../lang/gcc3-c++
+BUILD_DEPENDS+=		gcc3${GCC3_PKGMODIF}-c++-3.3:../../lang/gcc3-c++
 CONFIGURE_ARGS+=	--enable-languages="java"
 CONFIGURE_ARGS+=	--with-system-zlib
 # done manually in do-build
diff --git a/lang/gcc3-objc/Makefile b/lang/gcc3-objc/Makefile
index e1f542602a9..37be04c5598 100644
--- a/lang/gcc3-objc/Makefile
+++ b/lang/gcc3-objc/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2003/07/08 15:05:03 drochner Exp $
+# $NetBSD: Makefile,v 1.4 2003/07/16 20:24:00 drochner Exp $
 #
 
-PKGNAME=		gcc3-objc-3.3
+PKGNAME=		gcc3${GCC3_PKGMODIF}-objc-3.3
 COMMENT=		GNU Compiler Collection, objc Compiler
 
 .include "../gcc3-c/buildaddon.mk"