diff options
| author | dholland <dholland@pkgsrc.org> | 2016-07-03 19:16:03 +0000 |
|---|---|---|
| committer | dholland <dholland@pkgsrc.org> | 2016-07-03 19:16:03 +0000 |
| commit | 310f870dcce257371b977d0b5697e9d0cbf9608d (patch) | |
| tree | 44e5cfe24dc2c975be84321a74a7064a1e52163a /lang | |
| parent | cd141763e199542900d92ca0e82e5d17b7a33bac (diff) | |
| download | pkgsrc-310f870dcce257371b977d0b5697e9d0cbf9608d.tar.gz | |
Use BUILD_ENV properly.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/smlnj/Makefile | 15 | ||||
| -rw-r--r-- | lang/smlnj11072/Makefile | 15 |
2 files changed, 22 insertions, 8 deletions
diff --git a/lang/smlnj/Makefile b/lang/smlnj/Makefile index d2cdf307b1c..387b184a1d4 100644 --- a/lang/smlnj/Makefile +++ b/lang/smlnj/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2016/07/03 19:15:02 dholland Exp $ +# $NetBSD: Makefile,v 1.29 2016/07/03 19:16:03 dholland Exp $ # DISTNAME= boot.${BOX}-unix @@ -45,6 +45,15 @@ SML_LIBDIR= ${SML_BASE}/lib SML_BINDIR= ${SML_BASE}/bin SML_SCRIPTS= _link-sml _run-sml _ml-build _ml-makedepend +# while building, the work directory is the "installation" +BUILD_ENV+= SMLNJ_HOME="${WRKDIR}" + +# the build uses patch directly (yuk) +BUILD_ENV+= PATCH=${PATCH:Q} PATCH_ARGS=${PATCH_ARGS:Q} + +# not sure why this is needed (XXX?) +BUILD_ENV+= FILESDIR=${FILESDIR} + # note that this includes bsd.prefs.mk .include "../../lang/smlnj/Makefile.common" @@ -115,9 +124,7 @@ do-configure: # The build target needs to run $WRKDIR/config/install.sh do-build: - cd ${WRKDIR} && unset PWD && \ - FILESDIR=${FILESDIR} PATCH=${PATCH:Q} PATCH_ARGS=${PATCH_ARGS:Q} \ - SMLNJ_HOME="${WRKDIR}" ./config/install.sh + cd ${WRKDIR} && unset PWD && ${SETENV} ${BUILD_ENV} ./config/install.sh # install target # (see ftp://ftp.research.bell-labs.com/dist/smlnj/working/110.38/INSTALL) diff --git a/lang/smlnj11072/Makefile b/lang/smlnj11072/Makefile index a134605da35..2d168cf5c83 100644 --- a/lang/smlnj11072/Makefile +++ b/lang/smlnj11072/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2016/07/03 19:15:02 dholland Exp $ +# $NetBSD: Makefile,v 1.5 2016/07/03 19:16:03 dholland Exp $ # DISTNAME= boot.${BOX}-unix @@ -44,6 +44,15 @@ SML_LIBDIR= ${SML_BASE}/lib SML_BINDIR= ${SML_BASE}/bin SML_SCRIPTS= _link-sml _run-sml _ml-build _ml-makedepend +# while building, the work directory is the "installation" +BUILD_ENV+= SMLNJ_HOME="${WRKDIR}" + +# the build uses patch directly (yuk) +BUILD_ENV+= PATCH=${PATCH:Q} PATCH_ARGS=${PATCH_ARGS:Q} + +# not sure why this is needed (XXX?) +BUILD_ENV+= FILESDIR=${FILESDIR} + # note that this includes bsd.prefs.mk .include "../../lang/smlnj/Makefile.common" @@ -114,9 +123,7 @@ do-configure: # The build target needs to run $WRKDIR/config/install.sh do-build: - cd ${WRKDIR} && unset PWD && \ - FILESDIR=${FILESDIR} PATCH=${PATCH:Q} PATCH_ARGS=${PATCH_ARGS:Q} \ - SMLNJ_HOME="${WRKDIR}" ./config/install.sh + cd ${WRKDIR} && unset PWD && ${SETENV} ${BUILD_ENV} ./config/install.sh # install target # (see ftp://ftp.research.bell-labs.com/dist/smlnj/working/110.38/INSTALL) |