[pkgsrc/trunk]: pkgsrc/lang Check if a variable is defined before checking it...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c7891a37c712
branches:  trunk
changeset: 468356:c7891a37c712
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Fri Feb 13 00:27:28 2004 +0000

description:
Check if a variable is defined before checking its value.

diffstat:

 lang/gcc3-c++/buildlink3.mk  |  6 ++++--
 lang/gcc3-f77/buildlink3.mk  |  6 ++++--
 lang/gcc3-java/buildlink3.mk |  6 ++++--
 lang/gcc3-objc/buildlink3.mk |  6 ++++--
 4 files changed, 16 insertions(+), 8 deletions(-)

diffs (84 lines):

diff -r fb0bc821aa5c -r c7891a37c712 lang/gcc3-c++/buildlink3.mk
--- a/lang/gcc3-c++/buildlink3.mk       Fri Feb 13 00:16:00 2004 +0000
+++ b/lang/gcc3-c++/buildlink3.mk       Fri Feb 13 00:27:28 2004 +0000
@@ -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 @@
 .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 -r fb0bc821aa5c -r c7891a37c712 lang/gcc3-f77/buildlink3.mk
--- a/lang/gcc3-f77/buildlink3.mk       Fri Feb 13 00:16:00 2004 +0000
+++ b/lang/gcc3-f77/buildlink3.mk       Fri Feb 13 00:27:28 2004 +0000
@@ -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 @@
 .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 -r fb0bc821aa5c -r c7891a37c712 lang/gcc3-java/buildlink3.mk
--- a/lang/gcc3-java/buildlink3.mk      Fri Feb 13 00:16:00 2004 +0000
+++ b/lang/gcc3-java/buildlink3.mk      Fri Feb 13 00:27:28 2004 +0000
@@ -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 @@
 .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 -r fb0bc821aa5c -r c7891a37c712 lang/gcc3-objc/buildlink3.mk
--- a/lang/gcc3-objc/buildlink3.mk      Fri Feb 13 00:16:00 2004 +0000
+++ b/lang/gcc3-objc/buildlink3.mk      Fri Feb 13 00:27:28 2004 +0000
@@ -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 @@
 .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