diff options
| author | xtraeme <xtraeme> | 2004-07-29 06:36:32 +0000 |
|---|---|---|
| committer | xtraeme <xtraeme> | 2004-07-29 06:36:32 +0000 |
| commit | 1d7604642cf5032afc3b10d18dfe74e95aa9c643 (patch) | |
| tree | 6e4eadfeefda4ef4c7226ca902410714de716947 /meta-pkgs | |
| parent | b83c5eb7bcca21964a323fa07c28830afe8de588 (diff) | |
| download | pkgsrc-1d7604642cf5032afc3b10d18dfe74e95aa9c643.tar.gz | |
xorg packages now will be installed into ${PREFIX}/xorg by default,
so we don't have to conflict between XFree86 and xorg.
Suggested by grant@.
Diffstat (limited to 'meta-pkgs')
| -rw-r--r-- | meta-pkgs/xorg/Makefile.common | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/meta-pkgs/xorg/Makefile.common b/meta-pkgs/xorg/Makefile.common index a9afb3ab0bb..b85711ac5bd 100644 --- a/meta-pkgs/xorg/Makefile.common +++ b/meta-pkgs/xorg/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.1.1.1 2004/07/29 04:48:32 xtraeme Exp $ +# $NetBSD: Makefile.common,v 1.2 2004/07/29 06:36:34 xtraeme Exp $ # # XBUILD_DIRS is the group of directories under ${WRKSRC} that will # be built in. @@ -103,10 +103,9 @@ PKG_FAIL_REASON+= "X11_TYPE=xorg is mandatory." NO_MTREE= # defined -X11ROOT_PREFIX?= X11R6 +X11ROOT_PREFIX?= xorg WRKSRC?= ${WRKDIR}/xc X11ROOT?= ${PREFIX}/${X11ROOT_PREFIX} -X11BASE= ${X11ROOT} PREPEND_PATH= ${X11ROOT}/bin # Make sure we have this in PATH :) PLIST_SUBST+= X11ROOT_PREFIX=${X11ROOT_PREFIX} |