diff options
| author | jlam <jlam@pkgsrc.org> | 2004-02-13 00:27:28 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-02-13 00:27:28 +0000 |
| commit | b2645adf509dd3e6c4ef52e094eeb8e5f1e0279a (patch) | |
| tree | 36df603cadf66d5fd0a77d2a49c77c3904e3ef55 | |
| parent | 0ff2e7acc80b466d81d0e8471c8bc2d0eb849948 (diff) | |
| download | pkgsrc-b2645adf509dd3e6c4ef52e094eeb8e5f1e0279a.tar.gz | |
Check if a variable is defined before checking its value.
| -rw-r--r-- | lang/gcc3-c++/buildlink3.mk | 6 | ||||
| -rw-r--r-- | lang/gcc3-f77/buildlink3.mk | 6 | ||||
| -rw-r--r-- | lang/gcc3-java/buildlink3.mk | 6 | ||||
| -rw-r--r-- | lang/gcc3-objc/buildlink3.mk | 6 |
4 files changed, 16 insertions, 8 deletions
diff --git a/lang/gcc3-c++/buildlink3.mk b/lang/gcc3-c++/buildlink3.mk index 5695cfadd9e..cf84ea105eb 100644 --- a/lang/gcc3-c++/buildlink3.mk +++ b/lang/gcc3-c++/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2004/02/13 00:16:00 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2004/02/13 00:27:28 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GCC3CXX_BUILDLINK3_MK:= ${GCC3CXX_BUILDLINK3_MK}+ @@ -10,8 +10,10 @@ BUILDLINK_DEPENDS+= gcc3cxx .endif .if !empty(GCC3CXX_BUILDLINK3_MK:M+) -. if ${GCC3_INSTALLTO_SUBPREFIX} != "gcc3" +. if defined(GCC3_INSTALLTO_SUBPREFIX) +. if ${GCC3_INSTALLTO_SUBPREFIX} != "gcc3" GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX} +. endif . endif BUILDLINK_PACKAGES+= gcc3cxx BUILDLINK_DEPENDS.gcc3cxx+= gcc3${GCC3_PKGMODIF}-c++>=${_GCC_REQD} diff --git a/lang/gcc3-f77/buildlink3.mk b/lang/gcc3-f77/buildlink3.mk index 80c7723a3f7..d8f0e28b8f7 100644 --- a/lang/gcc3-f77/buildlink3.mk +++ b/lang/gcc3-f77/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2004/02/13 00:16:00 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2004/02/13 00:27:28 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GCC3F77_BUILDLINK3_MK:= ${GCC3F77_BUILDLINK3_MK}+ @@ -10,8 +10,10 @@ BUILDLINK_DEPENDS+= gcc3f77 .endif .if !empty(GCC3F77_BUILDLINK3_MK:M+) -. if ${GCC3_INSTALLTO_SUBPREFIX} != "gcc3" +. if defined(GCC3_INSTALLTO_SUBPREFIX) +. if ${GCC3_INSTALLTO_SUBPREFIX} != "gcc3" GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX} +. endif . endif BUILDLINK_PACKAGES+= gcc3f77 BUILDLINK_DEPENDS.gcc3f77+= gcc3${GCC3_PKGMODIF}-f77>=${_GCC_REQD} diff --git a/lang/gcc3-java/buildlink3.mk b/lang/gcc3-java/buildlink3.mk index f2c89bcd6f6..d09fdcf927b 100644 --- a/lang/gcc3-java/buildlink3.mk +++ b/lang/gcc3-java/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2004/02/13 00:16:00 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2004/02/13 00:27:28 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GCC3JAVA_BUILDLINK3_MK:= ${GCC3JAVA_BUILDLINK3_MK}+ @@ -10,8 +10,10 @@ BUILDLINK_DEPENDS+= gcc3java .endif .if !empty(GCC3JAVA_BUILDLINK3_MK:M+) -. if ${GCC3_INSTALLTO_SUBPREFIX} != "gcc3" +. if defined(GCC3_INSTALLTO_SUBPREFIX) +. if ${GCC3_INSTALLTO_SUBPREFIX} != "gcc3" GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX} +. endif . endif BUILDLINK_PACKAGES+= gcc3java BUILDLINK_DEPENDS.gcc3java+= gcc3${GCC3_PKGMODIF}-java>=${_GCC_REQD} diff --git a/lang/gcc3-objc/buildlink3.mk b/lang/gcc3-objc/buildlink3.mk index 01ccd8ad94f..5b0c6c7e9e3 100644 --- a/lang/gcc3-objc/buildlink3.mk +++ b/lang/gcc3-objc/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2004/02/13 00:16:00 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2004/02/13 00:27:28 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GCC3OBJC_BUILDLINK3_MK:= ${GCC3OBJC_BUILDLINK3_MK}+ @@ -10,8 +10,10 @@ BUILDLINK_DEPENDS+= gcc3objc .endif .if !empty(GCC3OBJC_BUILDLINK3_MK:M+) -. if ${GCC3_INSTALLTO_SUBPREFIX} != "gcc3" +. if defined(GCC3_INSTALLTO_SUBPREFIX) +. if ${GCC3_INSTALLTO_SUBPREFIX} != "gcc3" GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX} +. endif . endif BUILDLINK_PACKAGES+= gcc3objc BUILDLINK_DEPENDS+= gcc3objc |