diff options
| author | agc <agc> | 2000-07-03 14:47:11 +0000 |
|---|---|---|
| committer | agc <agc> | 2000-07-03 14:47:11 +0000 |
| commit | 558d99ec9e1aea72acb4f8bd18d18a7d15008195 (patch) | |
| tree | 8811101d11bdd1bfafe2c70f0658737f44ccf743 /mk | |
| parent | 37026d0d23f63b99489adbfe0d84c43bccfc4e7b (diff) | |
| download | pkgsrc-558d99ec9e1aea72acb4f8bd18d18a7d15008195.tar.gz | |
Don't bother defining an internal _USE_LOCALBASE_FOR_X11 variable - it's
not necessary. ".if ${X11PREFIX} == ${LOCALBASE}" works just as well.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 56348e51ab2..8a848074a51 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.493 2000/06/30 01:56:08 hubertf Exp $ \ +# $NetBSD: bsd.pkg.mk,v 1.494 2000/07/03 14:47:11 agc Exp $ \ # # This file is in the public domain. # @@ -84,16 +84,15 @@ 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 +# set X11PREFIX to reflect installed dir of X11 packages .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 ${X11PREFIX} == ${LOCALBASE} MOTIFBASE?= ${LOCALBASE} .elif ${OPSYS} == "SunOS" MOTIFBASE?= /usr/dt @@ -103,7 +102,7 @@ MOTIFBASE?= ${X11BASE} .endif # USE_MOTIF .if defined(USE_IMAKE) || defined(USE_MOTIF) || defined(USE_X11BASE) -.if defined(_USE_LOCALBASE_FOR_X11) +.if ${X11PREFIX} == ${LOCALBASE} PREFIX= ${LOCALBASE} .else PREFIX= ${X11BASE} @@ -860,7 +859,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 ${X11PREFIX} == ${LOCALBASE} CONFIGURE_ARGS+= --x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include .endif .endif |