summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorxtraeme <xtraeme>2004-08-07 14:44:05 +0000
committerxtraeme <xtraeme>2004-08-07 14:44:05 +0000
commita394b6588fb41a99e4e62c0ab8b3439bb8c0fa68 (patch)
treed366e9ce0b1165c7cd21210b6bad22dd536061bd /mk
parent257f83b8d92b7f8c87219bceccb5ff990ae5aa80 (diff)
downloadpkgsrc-a394b6588fb41a99e4e62c0ab8b3439bb8c0fa68.tar.gz
Fix some comparisson strings to handle XFree86/xorg dirs.mk files properly,
PR pkg/26576: Kouichirou Hiratsuka.
Diffstat (limited to 'mk')
-rw-r--r--mk/dirs.mk9
1 files changed, 5 insertions, 4 deletions
diff --git a/mk/dirs.mk b/mk/dirs.mk
index 4e30bf85fb1..9b1fdb54c25 100644
--- a/mk/dirs.mk
+++ b/mk/dirs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: dirs.mk,v 1.4 2004/07/29 07:27:43 xtraeme Exp $
+# $NetBSD: dirs.mk,v 1.5 2004/08/07 14:44:05 xtraeme Exp $
#
.if !defined(DIRS_MK)
@@ -21,11 +21,12 @@ _USE_GNOME1_DIRS:= ${ver}
_USE_GNOME2_DIRS:= ${ver}
. elif ${pkg} == "xdg" && ${_USE_XDG_DIRS} < ${ver} && !defined(USE_X11BASE)
_USE_XDG_DIRS:= ${ver}
-. elif ${pkg} == "xdg" && ${_USE_XDG_X11_DIRS} < ${ver} && defined(USE_X11BASE)
+. elif ${pkg} == "xdg-x11" && ${_USE_XDG_X11_DIRS} < ${ver} && \
+ defined(USE_X11BASE)
_USE_XDG_X11_DIRS:= ${ver}
-. elif ${pkg} == "xdg" && ${_USE_XFREE86_DIRS} < ${ver}
+. elif ${pkg} == "XFree86" && ${_USE_XFREE86_DIRS} < ${ver}
_USE_XFREE86_DIRS:= ${ver}
-. elif ${pkg} == "xdg" && ${_USE_XORG_DIRS} < ${ver}
+. elif ${pkg} == "xorg" && ${_USE_XORG_DIRS} < ${ver}
_USE_XORG_DIRS:= ${ver}
. endif