diff options
| author | jmmv <jmmv@pkgsrc.org> | 2004-04-14 19:30:22 +0000 |
|---|---|---|
| committer | jmmv <jmmv@pkgsrc.org> | 2004-04-14 19:30:22 +0000 |
| commit | a38e01dddeb06fa8965c2a3656d615f1b8485a65 (patch) | |
| tree | e30c50a407b6596227e9baab1c0a17bc5650861c /mk/dirs.mk | |
| parent | 09c5e7088b0f7b5eea020e6905ec8765d49dec33 (diff) | |
| download | pkgsrc-a38e01dddeb06fa8965c2a3656d615f1b8485a65.tar.gz | |
Drop the disctinction of xdg and xdg-x11 from USE_DIRS POV. We can choose
which one is required in an automatic way by checking USE_X11BASE. This
simplifies things and avoids possible problems in the future due to confusion.
Diffstat (limited to 'mk/dirs.mk')
| -rw-r--r-- | mk/dirs.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mk/dirs.mk b/mk/dirs.mk index 2ea0beeca4f..0894d751113 100644 --- a/mk/dirs.mk +++ b/mk/dirs.mk @@ -1,4 +1,4 @@ -# $NetBSD: dirs.mk,v 1.1 2004/04/14 15:26:41 jmmv Exp $ +# $NetBSD: dirs.mk,v 1.2 2004/04/14 19:30:22 jmmv Exp $ # .if !defined(DIRS_MK) @@ -17,9 +17,9 @@ ver:= ${dir:C/^.*-//} _USE_GNOME1_DIRS:= ${ver} . elif ${pkg} == "gnome2" && ${_USE_GNOME2_DIRS} < ${ver} _USE_GNOME2_DIRS:= ${ver} -. elif ${pkg} == "xdg" && ${_USE_XDG_DIRS} < ${ver} +. elif ${pkg} == "xdg" && ${_USE_XDG_DIRS} < ${ver} && !defined(USE_X11BASE) _USE_XDG_DIRS:= ${ver} -. elif ${pkg} == "xdg-x11" && ${_USE_XDG_DIRS_DIRS} < ${ver} +. elif ${pkg} == "xdg" && ${_USE_XDG_X11_DIRS} < ${ver} && defined(USE_X11BASE) _USE_XDG_X11_DIRS:= ${ver} . endif |