Fix the check for the GCC3_INSTALLTO_SUBPREFIX so that it matches the

behaviour in gcc3-c/Makefile.common.
This commit is contained in:
jlam 2004-02-13 00:16:00 +00:00
parent e2bdb27ae2
commit 0ff2e7acc8
4 changed files with 8 additions and 8 deletions

View file

@ -1,4 +1,4 @@
# $NetBSD: buildlink3.mk,v 1.3 2004/02/05 03:45:13 jlam Exp $ # $NetBSD: buildlink3.mk,v 1.4 2004/02/13 00:16:00 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GCC3CXX_BUILDLINK3_MK:= ${GCC3CXX_BUILDLINK3_MK}+ GCC3CXX_BUILDLINK3_MK:= ${GCC3CXX_BUILDLINK3_MK}+
@ -10,7 +10,7 @@ BUILDLINK_DEPENDS+= gcc3cxx
.endif .endif
.if !empty(GCC3CXX_BUILDLINK3_MK:M+) .if !empty(GCC3CXX_BUILDLINK3_MK:M+)
. if defined(GCC3_INSTALLTO_SUBPREFIX) . if ${GCC3_INSTALLTO_SUBPREFIX} != "gcc3"
GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX} GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX}
. endif . endif
BUILDLINK_PACKAGES+= gcc3cxx BUILDLINK_PACKAGES+= gcc3cxx

View file

@ -1,4 +1,4 @@
# $NetBSD: buildlink3.mk,v 1.3 2004/02/05 03:45:13 jlam Exp $ # $NetBSD: buildlink3.mk,v 1.4 2004/02/13 00:16:00 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GCC3F77_BUILDLINK3_MK:= ${GCC3F77_BUILDLINK3_MK}+ GCC3F77_BUILDLINK3_MK:= ${GCC3F77_BUILDLINK3_MK}+
@ -10,7 +10,7 @@ BUILDLINK_DEPENDS+= gcc3f77
.endif .endif
.if !empty(GCC3F77_BUILDLINK3_MK:M+) .if !empty(GCC3F77_BUILDLINK3_MK:M+)
. if defined(GCC3_INSTALLTO_SUBPREFIX) . if ${GCC3_INSTALLTO_SUBPREFIX} != "gcc3"
GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX} GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX}
. endif . endif
BUILDLINK_PACKAGES+= gcc3f77 BUILDLINK_PACKAGES+= gcc3f77

View file

@ -1,4 +1,4 @@
# $NetBSD: buildlink3.mk,v 1.3 2004/02/05 03:45:13 jlam Exp $ # $NetBSD: buildlink3.mk,v 1.4 2004/02/13 00:16:00 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GCC3JAVA_BUILDLINK3_MK:= ${GCC3JAVA_BUILDLINK3_MK}+ GCC3JAVA_BUILDLINK3_MK:= ${GCC3JAVA_BUILDLINK3_MK}+
@ -10,7 +10,7 @@ BUILDLINK_DEPENDS+= gcc3java
.endif .endif
.if !empty(GCC3JAVA_BUILDLINK3_MK:M+) .if !empty(GCC3JAVA_BUILDLINK3_MK:M+)
. if defined(GCC3_INSTALLTO_SUBPREFIX) . if ${GCC3_INSTALLTO_SUBPREFIX} != "gcc3"
GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX} GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX}
. endif . endif
BUILDLINK_PACKAGES+= gcc3java BUILDLINK_PACKAGES+= gcc3java

View file

@ -1,4 +1,4 @@
# $NetBSD: buildlink3.mk,v 1.3 2004/02/05 03:45:13 jlam Exp $ # $NetBSD: buildlink3.mk,v 1.4 2004/02/13 00:16:00 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GCC3OBJC_BUILDLINK3_MK:= ${GCC3OBJC_BUILDLINK3_MK}+ GCC3OBJC_BUILDLINK3_MK:= ${GCC3OBJC_BUILDLINK3_MK}+
@ -10,7 +10,7 @@ BUILDLINK_DEPENDS+= gcc3objc
.endif .endif
.if !empty(GCC3OBJC_BUILDLINK3_MK:M+) .if !empty(GCC3OBJC_BUILDLINK3_MK:M+)
. if defined(GCC3_INSTALLTO_SUBPREFIX) . if ${GCC3_INSTALLTO_SUBPREFIX} != "gcc3"
GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX} GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX}
. endif . endif
BUILDLINK_PACKAGES+= gcc3objc BUILDLINK_PACKAGES+= gcc3objc