summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoerg <joerg>2007-01-08 15:20:28 +0000
committerjoerg <joerg>2007-01-08 15:20:28 +0000
commit45adfe39e1e0ad19d93937fc6f108db532e098d6 (patch)
treeb5eba61de450791d3dcf0824e41a8c5f0d3282d0
parent3716b5e8dc09048d4f5a140dbf510f7b19bc1617 (diff)
downloadpkgsrc-45adfe39e1e0ad19d93937fc6f108db532e098d6.tar.gz
Always use xdg-dirs for modular Xorg, xdg-x11-dirs would just redirect
anyway.
-rw-r--r--mk/dirs.mk8
1 files changed, 6 insertions, 2 deletions
diff --git a/mk/dirs.mk b/mk/dirs.mk
index 60676724e17..0d73d6097c9 100644
--- a/mk/dirs.mk
+++ b/mk/dirs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: dirs.mk,v 1.8 2006/09/27 15:18:15 joerg Exp $
+# $NetBSD: dirs.mk,v 1.9 2007/01/08 15:20:28 joerg Exp $
#
.if !defined(DIRS_MK)
@@ -60,7 +60,11 @@ _USE_XORG_DIRS:= ${ver}
.endif
.if !empty(_USE_XDG_X11_DIRS)
-. include "../../misc/xdg-x11-dirs/dirs.mk"
+. if ${X11_TYPE} == "modular"
+. include "../../misc/xdg-dirs/dirs.mk"
+. else
+. include "../../misc/xdg-x11-dirs/dirs.mk"
+. endif
.endif
.if !empty(_USE_XORG_DIRS)