pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk Replaced .ifdef with .if defined() and .ifnded with...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/23db8b719e31
branches:  trunk
changeset: 493749:23db8b719e31
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sat May 14 01:51:52 2005 +0000

description:
Replaced .ifdef with .if defined() and .ifnded with .if !defined(). This
will allow better error checking.

diffstat:

 mk/bsd.prefs.mk |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (45 lines):

diff -r a2ec2561a778 -r 23db8b719e31 mk/bsd.prefs.mk
--- a/mk/bsd.prefs.mk   Sat May 14 01:50:38 2005 +0000
+++ b/mk/bsd.prefs.mk   Sat May 14 01:51:52 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.191 2005/05/13 17:22:43 jlam Exp $
+# $NetBSD: bsd.prefs.mk,v 1.192 2005/05/14 01:51:52 rillig Exp $
 #
 # Make file, included to get the site preferences, if any.  Should
 # only be included by package Makefiles before any .if defined()
@@ -7,7 +7,7 @@
 # the system defaults (sys.mk and bsd.own.mk) are used.
 
 # Do not recursively include mk.conf, redefine OPSYS, include bsd.own.mk, etc.
-.ifndef BSD_PKG_MK
+.if !defined(BSD_PKG_MK)
 
 # Let mk.conf know that this is pkgsrc.
 BSD_PKG_MK=1
@@ -45,14 +45,14 @@
 CUT=echo Unknown
 .endif
 
-.ifndef OPSYS
+.if !defined(OPSYS)
 OPSYS!=                        ${UNAME} -s | tr -d /
 .endif
 MAKEFLAGS+=            OPSYS=${OPSYS}
-.ifndef OS_VERSION
+.if !defined(OS_VERSION)
 OS_VERSION!=           ${UNAME} -r
 .endif
-.ifndef LOWER_OS_VERSION
+.if !defined(LOWER_OS_VERSION)
 LOWER_OS_VERSION!=     echo ${OS_VERSION} | tr 'A-Z' 'a-z'
 .endif
 MAKEFLAGS+=            OS_VERSION=${OS_VERSION}
@@ -439,7 +439,7 @@
 WHOLE_ARCHIVE_FLAG?=   ${_OPSYS_WHOLE_ARCHIVE_FLAG}
 NO_WHOLE_ARCHIVE_FLAG?=        ${_OPSYS_NO_WHOLE_ARCHIVE_FLAG}
 
-.ifndef DIGEST
+.if !defined(DIGEST)
 DIGEST:=               ${LOCALBASE}/bin/digest
 MAKEFLAGS+=            DIGEST=${DIGEST}
 .endif



Home | Main Index | Thread Index | Old Index