diff options
| author | rh <rh@pkgsrc.org> | 2002-09-15 11:58:22 +0000 |
|---|---|---|
| committer | rh <rh@pkgsrc.org> | 2002-09-15 11:58:22 +0000 |
| commit | 5d9dea26a6a94318e5be84dac8b08ce87a0c050e (patch) | |
| tree | a6f20fd65b88603ec9a8201e231afb084aa77e3e /mk | |
| parent | 3e67561d2463f79088856061d9662705b40a50b8 (diff) | |
| download | pkgsrc-5d9dea26a6a94318e5be84dac8b08ce87a0c050e.tar.gz | |
Move xpkgwedge check from bsd.pkg.mk to bsd.prefs.mk so that X11PREFIX
location check within package Makefiles actually works as expected.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 19 | ||||
| -rw-r--r-- | mk/bsd.prefs.mk | 21 |
2 files changed, 21 insertions, 19 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 1e41013010f..dd461cd8ba6 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1045 2002/09/12 10:34:29 jlam Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1046 2002/09/15 11:58:22 rh Exp $ # # This file is in the public domain. # @@ -152,23 +152,6 @@ CONFIGURE_ENV+= CLASSPATH=${CLASSPATH} SCRIPTS_ENV+= CLASSPATH=${CLASSPATH} .endif -# Set X11PREFIX to reflect the install directory of X11 packages. -# Set XMKMF_CMD properly if xpkgwedge is installed. -# -# The check for the existence of ${X11BASE}/lib/X11/config/xpkgwedge.def -# is to catch users of xpkgwedge<1.0. -# -XMKMF?= ${XMKMF_CMD} ${XMKMF_FLAGS} -a -XMKMF_FLAGS?= # empty -.if exists(${LOCALBASE}/lib/X11/config/xpkgwedge.def) || \ - exists(${X11BASE}/lib/X11/config/xpkgwedge.def) -X11PREFIX= ${LOCALBASE} -XMKMF_CMD?= ${X11PREFIX}/bin/pkgxmkmf -.else -X11PREFIX= ${X11BASE} -XMKMF_CMD?= ${X11PREFIX}/bin/xmkmf -.endif - # Set the default BUILDLINK_DIR, BUILDLINK_X11PKG_DIR, BUILDLINK_X11_DIR so # that if no buildlink.mk files are included, then they still point to # where headers and libraries for installed packages and X11R6 may be found. diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index 918f08cbaa8..b35cf4a31e2 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.76 2002/09/01 15:13:41 tron Exp $ +# $NetBSD: bsd.prefs.mk,v 1.77 2002/09/15 11:58:23 rh Exp $ # # Make file, included to get the site preferences, if any. Should # only be included by package Makefiles before any .if defined() @@ -285,6 +285,25 @@ LOCALBASE?= ${DESTDIR}/usr/pkg X11BASE?= ${DESTDIR}/usr/X11R6 CROSSBASE?= ${LOCALBASE}/cross +# Set X11PREFIX to reflect the install directory of X11 packages. +# Set XMKMF_CMD properly if xpkgwedge is installed. +# +# The check for the existence of ${X11BASE}/lib/X11/config/xpkgwedge.def +# is to catch users of xpkgwedge<1.0. +# +XMKMF?= ${XMKMF_CMD} ${XMKMF_FLAGS} -a +XMKMF_FLAGS?= # empty +.if exists(${LOCALBASE}/lib/X11/config/xpkgwedge.def) || \ + exists(${X11BASE}/lib/X11/config/xpkgwedge.def) +HAVE_XPKGWEDGE= yes +X11PREFIX= ${LOCALBASE} +XMKMF_CMD?= ${X11PREFIX}/bin/pkgxmkmf +.else +X11PREFIX= ${X11BASE} +XMKMF_CMD?= ${X11PREFIX}/bin/xmkmf +.endif + + .ifndef DIGEST DIGEST:= ${LOCALBASE}/bin/digest MAKEFLAGS+= DIGEST=${DIGEST} |