diff options
| author | seb <seb@pkgsrc.org> | 2004-02-12 15:34:18 +0000 |
|---|---|---|
| committer | seb <seb@pkgsrc.org> | 2004-02-12 15:34:18 +0000 |
| commit | 15e433f451c597fd7bdd5fd7057281402b29ca2c (patch) | |
| tree | 788dc34e598b9a2cfbe12acf73eb333d01557a45 /mk/bsd.pkg.mk | |
| parent | 27f7db673c1769ea93b84d7308750e068c9f41bf (diff) | |
| download | pkgsrc-15e433f451c597fd7bdd5fd7057281402b29ca2c.tar.gz | |
Always add --x-{includes,libraries}=${X11BASE}/{include,lib}
to CONFIGURE_ARGS if USE_X11 is defined i.e no need to special case
xpkgwedge usage.
Please note that previously these were added to CONFIGURE_ARGS
as soon as xpkgwedge was used even if the package did not actually
defined USE_X11 or something implying it.
Diffstat (limited to 'mk/bsd.pkg.mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 8fec46da0b6..7ddb92a5b17 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1391 2004/02/12 13:39:57 jlam Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1392 2004/02/12 15:34:18 seb Exp $ # # This file is in the public domain. # @@ -1295,7 +1295,7 @@ GNU_CONFIGURE_PREFIX?= ${PREFIX} CONFIGURE_ARGS+= --host=${MACHINE_GNU_PLATFORM} CONFIGURE_ARGS+= --prefix=${GNU_CONFIGURE_PREFIX} HAS_CONFIGURE= yes -. if ${X11PREFIX} == ${LOCALBASE} +. if defined(USE_X11) CONFIGURE_ARGS+= --x-includes=${X11BASE}/include CONFIGURE_ARGS+= --x-libraries=${X11BASE}/lib . endif |