diff options
| author | jlam <jlam> | 2004-02-13 00:16:00 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2004-02-13 00:16:00 +0000 |
| commit | 6b7d754e084213de457fb6a8a48384cce7406514 (patch) | |
| tree | f314785dd3ea93abb255ae4e2340734399899454 | |
| parent | 2200af31c74f1140d2528d3cd2d1495115b00bb5 (diff) | |
| download | pkgsrc-6b7d754e084213de457fb6a8a48384cce7406514.tar.gz | |
Fix the check for the GCC3_INSTALLTO_SUBPREFIX so that it matches the
behaviour in gcc3-c/Makefile.common.
| -rw-r--r-- | lang/gcc3-c++/buildlink3.mk | 4 | ||||
| -rw-r--r-- | lang/gcc3-f77/buildlink3.mk | 4 | ||||
| -rw-r--r-- | lang/gcc3-java/buildlink3.mk | 4 | ||||
| -rw-r--r-- | lang/gcc3-objc/buildlink3.mk | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/lang/gcc3-c++/buildlink3.mk b/lang/gcc3-c++/buildlink3.mk index b3b4a6ce668..5695cfadd9e 100644 --- a/lang/gcc3-c++/buildlink3.mk +++ b/lang/gcc3-c++/buildlink3.mk @@ -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}+ GCC3CXX_BUILDLINK3_MK:= ${GCC3CXX_BUILDLINK3_MK}+ @@ -10,7 +10,7 @@ BUILDLINK_DEPENDS+= gcc3cxx .endif .if !empty(GCC3CXX_BUILDLINK3_MK:M+) -. if defined(GCC3_INSTALLTO_SUBPREFIX) +. if ${GCC3_INSTALLTO_SUBPREFIX} != "gcc3" GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX} . endif BUILDLINK_PACKAGES+= gcc3cxx diff --git a/lang/gcc3-f77/buildlink3.mk b/lang/gcc3-f77/buildlink3.mk index a2c431dd591..80c7723a3f7 100644 --- a/lang/gcc3-f77/buildlink3.mk +++ b/lang/gcc3-f77/buildlink3.mk @@ -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}+ GCC3F77_BUILDLINK3_MK:= ${GCC3F77_BUILDLINK3_MK}+ @@ -10,7 +10,7 @@ BUILDLINK_DEPENDS+= gcc3f77 .endif .if !empty(GCC3F77_BUILDLINK3_MK:M+) -. if defined(GCC3_INSTALLTO_SUBPREFIX) +. if ${GCC3_INSTALLTO_SUBPREFIX} != "gcc3" GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX} . endif BUILDLINK_PACKAGES+= gcc3f77 diff --git a/lang/gcc3-java/buildlink3.mk b/lang/gcc3-java/buildlink3.mk index 034f0bd8d50..f2c89bcd6f6 100644 --- a/lang/gcc3-java/buildlink3.mk +++ b/lang/gcc3-java/buildlink3.mk @@ -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}+ GCC3JAVA_BUILDLINK3_MK:= ${GCC3JAVA_BUILDLINK3_MK}+ @@ -10,7 +10,7 @@ BUILDLINK_DEPENDS+= gcc3java .endif .if !empty(GCC3JAVA_BUILDLINK3_MK:M+) -. if defined(GCC3_INSTALLTO_SUBPREFIX) +. if ${GCC3_INSTALLTO_SUBPREFIX} != "gcc3" GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX} . endif BUILDLINK_PACKAGES+= gcc3java diff --git a/lang/gcc3-objc/buildlink3.mk b/lang/gcc3-objc/buildlink3.mk index 1b431be0b36..01ccd8ad94f 100644 --- a/lang/gcc3-objc/buildlink3.mk +++ b/lang/gcc3-objc/buildlink3.mk @@ -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}+ GCC3OBJC_BUILDLINK3_MK:= ${GCC3OBJC_BUILDLINK3_MK}+ @@ -10,7 +10,7 @@ BUILDLINK_DEPENDS+= gcc3objc .endif .if !empty(GCC3OBJC_BUILDLINK3_MK:M+) -. if defined(GCC3_INSTALLTO_SUBPREFIX) +. if ${GCC3_INSTALLTO_SUBPREFIX} != "gcc3" GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX} . endif BUILDLINK_PACKAGES+= gcc3objc |