pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk Rename variable MAKEFILE to MAKE_FILE, as suggested...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/bf3eace6294b
branches:  trunk
changeset: 518418:bf3eace6294b
user:      obache <obache%pkgsrc.org@localhost>
date:      Sat Sep 09 02:35:13 2006 +0000

description:
Rename variable MAKEFILE to MAKE_FILE, as suggested in PR 28392.

diffstat:

 mk/build/bsd.build-vars.mk |  6 +++---
 mk/build/build.mk          |  6 +++---
 mk/build/test.mk           |  4 ++--
 mk/install/install.mk      |  4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diffs (87 lines):

diff -r 60132b1e8067 -r bf3eace6294b mk/build/bsd.build-vars.mk
--- a/mk/build/bsd.build-vars.mk        Fri Sep 08 23:32:13 2006 +0000
+++ b/mk/build/bsd.build-vars.mk        Sat Sep 09 02:35:13 2006 +0000
@@ -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 @@
 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 -r 60132b1e8067 -r bf3eace6294b mk/build/build.mk
--- a/mk/build/build.mk Fri Sep 08 23:32:13 2006 +0000
+++ b/mk/build/build.mk Sat Sep 09 02:35:13 2006 +0000
@@ -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 @@
        ${_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 -r 60132b1e8067 -r bf3eace6294b mk/build/test.mk
--- a/mk/build/test.mk  Fri Sep 08 23:32:13 2006 +0000
+++ b/mk/build/test.mk  Sat Sep 09 02:35:13 2006 +0000
@@ -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 @@
        ${_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:
diff -r 60132b1e8067 -r bf3eace6294b mk/install/install.mk
--- a/mk/install/install.mk     Fri Sep 08 23:32:13 2006 +0000
+++ b/mk/install/install.mk     Sat Sep 09 02:35:13 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: install.mk,v 1.17 2006/08/09 15:25:49 jlam Exp $
+# $NetBSD: install.mk,v 1.18 2006/09/09 02:35:13 obache Exp $
 
 ######################################################################
 ### install (PUBLIC)
@@ -264,7 +264,7 @@
        ${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD}                       \
        cd ${WRKSRC} && cd ${_dir_} &&                                  \
        ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${INSTALL_MAKE_FLAGS}     \
-               -f ${MAKEFILE} ${INSTALL_TARGET}
+               -f ${MAKE_FILE} ${INSTALL_TARGET}
 .  endfor
 .endif
 



Home | Main Index | Thread Index | Old Index