diff options
| author | agc <agc> | 1998-06-10 08:02:08 +0000 |
|---|---|---|
| committer | agc <agc> | 1998-06-10 08:02:08 +0000 |
| commit | 5e84a634d27add6fb89b751d0d34249ca6606522 (patch) | |
| tree | 6666e3fdc661d0f840de3ed2df836db67e9df18b /mk | |
| parent | 90d87930c14604122ac6274e753fdccad9e9443a (diff) | |
| download | pkgsrc-5e84a634d27add6fb89b751d0d34249ca6606522.tar.gz | |
Remove the trailing '-f' from MAKE_FLAGS in bsd.pkg.mk, and include it
explicitly in the commands before ${MAKEFILE}; modify package
Makefiles to conform to this rationalisation. This was used
inconsistently in many packages, some including it, some not.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 8db1c8848dc..e9572d6e3db 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.98 1998/06/09 13:36:48 agc Exp $ +# $NetBSD: bsd.pkg.mk,v 1.99 1998/06/10 08:02:10 agc Exp $ # # This file is in the public domain. # @@ -166,7 +166,7 @@ MD5?= md5 .endif MD5_FILE?= ${FILESDIR}/md5 -MAKE_FLAGS?= -f +MAKE_FLAGS?= MAKEFILE?= Makefile MAKE_ENV+= PATH=${PATH}:${LOCALBASE}/bin:${X11BASE}/bin PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} MOTIFLIB="${MOTIFLIB}" CFLAGS="${CFLAGS}" @@ -907,14 +907,14 @@ do-configure: .if !target(do-build) do-build: - @(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} ${MAKEFILE} ${ALL_TARGET}) + @(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} ${ALL_TARGET}) .endif # Install .if !target(do-install) do-install: - @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET}) + @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} ${INSTALL_TARGET}) @for f in ${INFO_FILES}; do \ ${ECHO} "${LOCALBASE}/bin/install-info --info-dir=${PREFIX}/info ${PREFIX}/info/$$f"; \ ${LOCALBASE}/bin/install-info --info-dir=${PREFIX}/info ${PREFIX}/info/$$f; \ |