diff options
| author | obache <obache@pkgsrc.org> | 2006-09-09 02:35:13 +0000 |
|---|---|---|
| committer | obache <obache@pkgsrc.org> | 2006-09-09 02:35:13 +0000 |
| commit | 33d4b2b7d2bf1b25fa52f8a91b687743b836bdb3 (patch) | |
| tree | 0c53b4d0ebf0e4ba5283ec2695b7f4d9dc473c21 /mk/build | |
| parent | ab7da32b547e2544dbf045ccc7508d27a3108ec1 (diff) | |
| download | pkgsrc-33d4b2b7d2bf1b25fa52f8a91b687743b836bdb3.tar.gz | |
Rename variable MAKEFILE to MAKE_FILE, as suggested in PR 28392.
Diffstat (limited to 'mk/build')
| -rw-r--r-- | mk/build/bsd.build-vars.mk | 6 | ||||
| -rw-r--r-- | mk/build/build.mk | 6 | ||||
| -rw-r--r-- | mk/build/test.mk | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/mk/build/bsd.build-vars.mk b/mk/build/bsd.build-vars.mk index af23a9f8be5..d71374bb3ba 100644 --- a/mk/build/bsd.build-vars.mk +++ b/mk/build/bsd.build-vars.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.build-vars.mk,v 1.2 2006/07/21 14:27:56 jlam Exp $ +# $NetBSD: bsd.build-vars.mk,v 1.3 2006/09/09 02:35:13 obache Exp $ # # BUILD_DIRS is the list of directories in which to perform the build # process. If the directories are relative paths, then they @@ -14,7 +14,7 @@ # # MAKE_FLAGS is a list of arguments that is pass to the make process. # -# MAKEFILE is the path to the makefile that is processed by the make +# MAKE_FILE is the path to the makefile that is processed by the make # executable. If the path is relative, then it is assumed to # be relative to each directory listed in BUILD_DIRS. # @@ -22,7 +22,7 @@ BUILD_DIRS?= ${CONFIGURE_DIRS} MAKE_PROGRAM?= ${MAKE} MAKE_ENV?= # empty MAKE_FLAGS?= # empty -MAKEFILE?= Makefile +MAKE_FILE?= Makefile MAKE_ENV+= ${ALL_ENV} MAKE_ENV+= ${NO_EXPORT_CPP:D:UCPP=${CPP:Q}} diff --git a/mk/build/build.mk b/mk/build/build.mk index 917d26a70bc..4bdb931f579 100644 --- a/mk/build/build.mk +++ b/mk/build/build.mk @@ -1,9 +1,9 @@ -# $NetBSD: build.mk,v 1.5 2006/07/22 16:31:35 jlam Exp $ +# $NetBSD: build.mk,v 1.6 2006/09/09 02:35:13 obache Exp $ # # BUILD_MAKE_FLAGS is the list of arguments that is passed to the make # process. # -# BUILD_TARGET is the target from ${MAKEFILE} that should be invoked +# BUILD_TARGET is the target from ${MAKE_FILE} that should be invoked # to build the sources. # BUILD_MAKE_FLAGS?= ${MAKE_FLAGS} @@ -97,7 +97,7 @@ do-build: ${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD} \ cd ${WRKSRC} && cd ${_dir_} && \ ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS} \ - -f ${MAKEFILE} ${BUILD_TARGET} + -f ${MAKE_FILE} ${BUILD_TARGET} . endfor .endif diff --git a/mk/build/test.mk b/mk/build/test.mk index 66321409854..b3667d31a24 100644 --- a/mk/build/test.mk +++ b/mk/build/test.mk @@ -1,4 +1,4 @@ -# $NetBSD: test.mk,v 1.6 2006/07/22 16:31:35 jlam Exp $ +# $NetBSD: test.mk,v 1.7 2006/09/09 02:35:13 obache Exp $ # # TEST_DIRS is the list of directories in which to perform the build # process. If the directories are relative paths, then they @@ -101,7 +101,7 @@ do-test: ${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD} \ cd ${WRKSRC} && cd ${_dir_} && \ ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${TEST_MAKE_FLAGS} \ - -f ${MAKEFILE} ${TEST_TARGET} + -f ${MAKE_FILE} ${TEST_TARGET} . endfor . else do-test: |