diff options
| -rw-r--r-- | meta-pkgs/xorg/Makefile | 3 | ||||
| -rw-r--r-- | mk/dirs.mk | 9 | ||||
| -rw-r--r-- | x11/xorg-imake/Makefile | 3 |
3 files changed, 12 insertions, 3 deletions
diff --git a/meta-pkgs/xorg/Makefile b/meta-pkgs/xorg/Makefile index 0365e254058..5f7265e64f8 100644 --- a/meta-pkgs/xorg/Makefile +++ b/meta-pkgs/xorg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2004/07/29 04:48:33 xtraeme Exp $ +# $NetBSD: Makefile,v 1.2 2004/07/29 07:27:43 xtraeme Exp $ DISTNAME= # empty PKGNAME= xorg-${XORG_VER} @@ -28,6 +28,7 @@ NO_BUILDLINK= # defined NO_CHECKSUM= # defined NO_MTREE= # defined NO_XORG_TARGETS= # defined +USE_DIRS+= xorg-1.0 NO_CONFIGURE= # defined do-install: diff --git a/mk/dirs.mk b/mk/dirs.mk index 53dcd07851c..4e30bf85fb1 100644 --- a/mk/dirs.mk +++ b/mk/dirs.mk @@ -1,4 +1,4 @@ -# $NetBSD: dirs.mk,v 1.3 2004/04/14 21:15:01 jmmv Exp $ +# $NetBSD: dirs.mk,v 1.4 2004/07/29 07:27:43 xtraeme Exp $ # .if !defined(DIRS_MK) @@ -9,6 +9,7 @@ _USE_GNOME2_DIRS= # empty _USE_XDG_DIRS= # empty _USE_XDG_X11_DIRS= # empty _USE_XFREE86_DIRS= # empty +_USE_XORG_DIRS= # empty .for dir in ${USE_DIRS} pkg:= ${dir:C/-[^-]*$//} @@ -24,6 +25,8 @@ _USE_XDG_DIRS:= ${ver} _USE_XDG_X11_DIRS:= ${ver} . elif ${pkg} == "xdg" && ${_USE_XFREE86_DIRS} < ${ver} _USE_XFREE86_DIRS:= ${ver} +. elif ${pkg} == "xdg" && ${_USE_XORG_DIRS} < ${ver} +_USE_XORG_DIRS:= ${ver} . endif .endfor @@ -51,4 +54,8 @@ _USE_XFREE86_DIRS:= ${ver} . include "../../misc/XFree86-dirs/dirs.mk" .endif +.if !empty(_USE_XORG_DIRS) +. include "../../misc/xorg-dirs/dirs.mk" +.endif + .endif # !defined(DIRS_MK) diff --git a/x11/xorg-imake/Makefile b/x11/xorg-imake/Makefile index 8429ddf9c6a..647ef6c9a37 100644 --- a/x11/xorg-imake/Makefile +++ b/x11/xorg-imake/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2004/07/29 06:36:34 xtraeme Exp $ +# $NetBSD: Makefile,v 1.3 2004/07/29 07:27:43 xtraeme Exp $ DISTNAME= ${DISTFILES} PKGNAME= xorg-imake-${XORG_VER} @@ -13,6 +13,7 @@ COMMENT= Imake and other utilities from X.org PKG_INSTALLATION_TYPES= overwrite pkgviews USE_BUILDLINK3= yes +USE_DIRS+= xorg-1.0 INSTALL_TARGET= install install.man NO_XORG_TARGETS= # defined |