diff options
author | agc <agc> | 2000-06-28 15:02:31 +0000 |
---|---|---|
committer | agc <agc> | 2000-06-28 15:02:31 +0000 |
commit | 7823cbd3fdf4594d61188cdc4a357c28d2544aa5 (patch) | |
tree | e1e958d7fe44f379d6354bef4bcd8ea6292956ff /mk | |
parent | 1b129b324627e65c3bef5121fb7c220cd6ba9508 (diff) | |
download | pkgsrc-7823cbd3fdf4594d61188cdc4a357c28d2544aa5.tar.gz |
Remove the user setting of the USE_LOCALBASE_FOR_X11 definition.
(Users can still set it if they want, but it won't make much
difference).
In bsd.pkg.mk, check for the presence of the xpkgwedge package to
determine whether to use LOCALBASE for X11 programs. Set
_USE_LOCALBASE_FOR_X11 (an internal definition) if xpkgwedge is
installed. Remove BUILD_DEPENDS on xpkgwedge (it would always have
been true anyway).
Add a new X11PREFIX definition, which reflects the PREFIX for X11
packages, and set it to LOCALBASE or X11BASE accordingly.
Remove all references to USE_LOCALBASE_FOR_X11 from the xpkgwedge
package.
In all, make the installation of xpkgwedge a tad less clumsy.
Diffstat (limited to 'mk')
-rw-r--r-- | mk/bsd.pkg.mk | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 45359b62eb1..f69c9ba2f81 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.488 2000/06/27 20:14:45 hubertf Exp $ \ +# $NetBSD: bsd.pkg.mk,v 1.489 2000/06/28 15:02:31 agc Exp $ \ # # This file is in the public domain. # @@ -84,8 +84,16 @@ CONFIGURE_ENV+= CLASSPATH=${CLASSPATH} JAVA_HOME=${JAVA_HOME} SCRIPTS_ENV+= CLASSPATH=${CLASSPATH} JAVA_HOME=${JAVA_HOME} .endif +# if xpkgwedge is installed, set _USE_LOCALBASE_FOR_X11 and X11PREFIX +.if exists(${X11BASE}/lib/X11/config/xpkgwedge.def) +_USE_LOCALBASE_FOR_X11= yes +X11PREFIX= ${LOCALBASE} +.else +X11PREFIX= ${X11BASE} +.endif + .if defined(USE_MOTIF) -.if defined(USE_LOCALBASE_FOR_X11) +.if defined(_USE_LOCALBASE_FOR_X11) MOTIFBASE?= ${LOCALBASE} .elif ${OPSYS} == "SunOS" MOTIFBASE?= /usr/dt @@ -95,9 +103,8 @@ MOTIFBASE?= ${X11BASE} .endif # USE_MOTIF .if defined(USE_IMAKE) || defined(USE_MOTIF) || defined(USE_X11BASE) -.if defined(USE_LOCALBASE_FOR_X11) +.if defined(_USE_LOCALBASE_FOR_X11) PREFIX= ${LOCALBASE} -BUILD_DEPENDS+= ${X11BASE}/lib/X11/config/xpkgwedge.def:../../pkgtools/xpkgwedge .else PREFIX= ${X11BASE} .endif @@ -853,7 +860,7 @@ CONFIGURE_ENV+= PATH=${PATH}:${LOCALBASE}/bin:${X11BASE}/bin .if defined(GNU_CONFIGURE) CONFIGURE_ARGS+= --host=${MACHINE_GNU_PLATFORM} --prefix=${PREFIX} HAS_CONFIGURE= yes -.if defined(USE_LOCALBASE_FOR_X11) +.if defined(_USE_LOCALBASE_FOR_X11) CONFIGURE_ARGS+= --x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include .endif .endif @@ -2754,7 +2761,7 @@ COMMON_DIRS!= ${AWK} 'BEGIN { \ .if !target(print-PLIST) print-PLIST: - @${ECHO} '@comment $$NetBSD: bsd.pkg.mk,v 1.488 2000/06/27 20:14:45 hubertf Exp $$' + @${ECHO} '@comment $$NetBSD: bsd.pkg.mk,v 1.489 2000/06/28 15:02:31 agc Exp $$' @${FIND} ${PREFIX}/. -newer ${EXTRACT_COOKIE} \! -type d \ | ${SED} s@${PREFIX}/./@@ \ | sort \ |