diff options
| author | jlam <jlam> | 2002-01-03 20:00:06 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2002-01-03 20:00:06 +0000 |
| commit | fce3ba565dc995f541b9e4902ae3aff94c0aa4a3 (patch) | |
| tree | 58766c4eef6aec4d75374f52410c0336b402ab4d /mk | |
| parent | 1b4a2c0aa167aa0d0a09a7f7379c9d85318f1e83 (diff) | |
| download | pkgsrc-fce3ba565dc995f541b9e4902ae3aff94c0aa4a3.tar.gz | |
Explicitly set BUILDLINK_DIR and BUILDLINK_X11_DIR with = instead of ?=.
We really don't want these to change from the correct values (within
${WRKDIR}).
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.buildlink.mk | 4 | ||||
| -rw-r--r-- | mk/x11.buildlink.mk | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mk/bsd.buildlink.mk b/mk/bsd.buildlink.mk index dbf1ea6ac96..f27982c5740 100644 --- a/mk/bsd.buildlink.mk +++ b/mk/bsd.buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.buildlink.mk,v 1.52 2002/01/01 19:10:03 jlam Exp $ +# $NetBSD: bsd.buildlink.mk,v 1.53 2002/01/03 20:00:06 jlam Exp $ # # This Makefile fragment is included by package buildlink.mk files. This # file does the following things: @@ -117,7 +117,7 @@ .if !defined(_BSD_BUILDLINK_MK) _BSD_BUILDLINK_MK= # defined -BUILDLINK_DIR?= ${WRKDIR}/.buildlink +BUILDLINK_DIR= ${WRKDIR}/.buildlink .if !defined(_BUILDLINK_CPPFLAGS) || !defined(_BUILDLINK_LDFLAGS) _BUILDLINK_CPPFLAGS= -I${BUILDLINK_DIR}/include diff --git a/mk/x11.buildlink.mk b/mk/x11.buildlink.mk index a0275571462..51c81e22cac 100644 --- a/mk/x11.buildlink.mk +++ b/mk/x11.buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: x11.buildlink.mk,v 1.13 2001/12/08 23:17:18 kristerw Exp $ +# $NetBSD: x11.buildlink.mk,v 1.14 2002/01/03 20:00:06 jlam Exp $ # # This Makefile fragment is included by packages that use X11. # @@ -22,7 +22,7 @@ USE_X11= # defined .include "../../mk/bsd.buildlink.mk" BUILD_DEPENDS+= x11-links>=0.5:../../pkgtools/x11-links -BUILDLINK_X11_DIR?= ${LOCALBASE}/share/x11-links +BUILDLINK_X11_DIR= ${LOCALBASE}/share/x11-links CONFIGURE_ENV+= BUILDLINK_X11_DIR="${BUILDLINK_X11_DIR}" MAKE_ENV+= BUILDLINK_X11_DIR="${BUILDLINK_X11_DIR}" |