pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/meta-pkgs/xorg Added defined() guards for the variable...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/66501a5fcb5d
branches:  trunk
changeset: 492022:66501a5fcb5d
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sun Apr 03 21:04:40 2005 +0000

description:
Added defined() guards for the variables XORG_PLIST_ENTRY and XEXTRACTS to
avoid Makefile parse errors. Reviewed by kristerw.

diffstat:

 meta-pkgs/xorg/Makefile.common |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 525089d721f7 -r 66501a5fcb5d meta-pkgs/xorg/Makefile.common
--- a/meta-pkgs/xorg/Makefile.common    Sun Apr 03 20:41:49 2005 +0000
+++ b/meta-pkgs/xorg/Makefile.common    Sun Apr 03 21:04:40 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.24 2005/03/30 20:41:02 hira Exp $
+# $NetBSD: Makefile.common,v 1.25 2005/04/03 21:04:40 rillig Exp $
 #
 # XBUILD_DIRS is the group of directories under ${WRKSRC} that will
 #   be built in.
@@ -159,7 +159,7 @@
 PLIST_SUBST+=          X11ROOT_PREFIX=${X11ROOT_PREFIX}
 MESSAGE_SUBST+=                X11ROOT=${X11ROOT}
 
-.if !empty(XORG_PLIST_ENTRY)
+.if defined(XORG_PLIST_ENTRY) && !empty(XORG_PLIST_ENTRY)
 .  for _e in ${XORG_PLIST_ENTRY}
 XORG_PLIST_SED+=       -e '/^@comment begin ${_e}$$/,/^@comment end ${_e}$$/p'
 .  endfor
@@ -296,7 +296,7 @@
 #
 # This can use for a single distfile.
 #
-.  if !empty(XEXTRACTS)
+.  if defined(XEXTRACTS) && !empty(XEXTRACTS)
 _EXTRACTS=             xc/config xc/include
 .    for _dir in ${XEXTRACTS}
 _EXTRACTS+=            xc/${_dir}



Home | Main Index | Thread Index | Old Index