summaryrefslogtreecommitdiff
path: root/meta-pkgs
diff options
context:
space:
mode:
authorrillig <rillig@pkgsrc.org>2005-04-03 21:04:40 +0000
committerrillig <rillig@pkgsrc.org>2005-04-03 21:04:40 +0000
commit74f58224fe52cec5321a36cc6708003db62e53a6 (patch)
treefd2741ea7fd440722b4d42ea9f13660a5343b8d8 /meta-pkgs
parent0943d7a1e63b81ee8b535c6472b9be0046193bd8 (diff)
downloadpkgsrc-74f58224fe52cec5321a36cc6708003db62e53a6.tar.gz
Added defined() guards for the variables XORG_PLIST_ENTRY and XEXTRACTS to
avoid Makefile parse errors. Reviewed by kristerw.
Diffstat (limited to 'meta-pkgs')
-rw-r--r--meta-pkgs/xorg/Makefile.common6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta-pkgs/xorg/Makefile.common b/meta-pkgs/xorg/Makefile.common
index a7321f2232b..d6137bf3a0f 100644
--- a/meta-pkgs/xorg/Makefile.common
+++ b/meta-pkgs/xorg/Makefile.common
@@ -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 @@ EGDIR?= ${LOCALBASE}/share/examples/xorg
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 @@ do-configure:
#
# 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}