From fa25ccb78dba65fa24132cc6c7adf0966337d223 Mon Sep 17 00:00:00 2001 From: dholland Date: Sun, 3 Jul 2016 19:18:46 +0000 Subject: Honor the pkgsrc configure shell instead of using /bin/sh, as on some platforms /bin/sh gets one something uselessly broken. Also, don't set MAKE to Solaris's make on Solaris; while this might be necessary building standalone, in pkgsrc it's foolish. --- lang/smlnj/Makefile | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'lang/smlnj/Makefile') diff --git a/lang/smlnj/Makefile b/lang/smlnj/Makefile index 387b184a1d4..71a97cc41b7 100644 --- a/lang/smlnj/Makefile +++ b/lang/smlnj/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2016/07/03 19:16:03 dholland Exp $ +# $NetBSD: Makefile,v 1.30 2016/07/03 19:18:46 dholland Exp $ # DISTNAME= boot.${BOX}-unix @@ -118,13 +118,21 @@ SUBST_MESSAGE.cflags= Setting CFLAGS SUBST_FILES.cflags= src/runtime/objs/* base/runtime/objs/* SUBST_VARS.cflags= CFLAGS +# use the proper shell +SUBST_CLASSES+= shell +SUBST_STAGE.shell= pre-configure +SUBST_MESSAGE.shell= Choosing the right shell +SUBST_FILES.shell= config/install.sh +SUBST_VARS.shell= CONFIG_SHELL + # nothing here any more do-configure: ${DO_NADA} # The build target needs to run $WRKDIR/config/install.sh do-build: - cd ${WRKDIR} && unset PWD && ${SETENV} ${BUILD_ENV} ./config/install.sh + cd ${WRKDIR} && unset PWD && ${SETENV} ${BUILD_ENV} \ + ${CONFIG_SHELL} ./config/install.sh # install target # (see ftp://ftp.research.bell-labs.com/dist/smlnj/working/110.38/INSTALL) -- cgit v1.2.3