Subject: Re: Renaming variable MAKEFILE to MAKE_FILE
To: None <tech-pkg@NetBSD.org>
From: OBATA Akio <obata@lins.jp>
List: tech-pkg
Date: 09/03/2006 20:57:02
On Sat, 2 Sep 2006 22:45:06 +0200, Juan RP wrote:
> On Sun, 3 Sep 2006 00:21:22 +0900
> OBATA Akio <obata@lins.jp> wrote:
> 
> > Hi,
> > 
> > Are there any objection about renaming variable `MAKEFILE' to
> > something like `MAKE_FILE'?
> > 
> > See also: PR 28392
> 
> No objection if that fixes pkgsrc with case insensitive filesystems.

Yes, works fine with pkgsrc tree on case insensitive filesystem,
then issie suggested in the PR will be fixed.
 But some packages need WRKOBJDIR on case sensitive filesystem.
 For example, lang/perl5, configure seems to create `Makefile', then remove
 `makefile', so failed to build with case insensitive filesystem.
 This is another issue.

Afer apply following patch, need to change more than 200 packages
using variable `MAKEFILE'. 

Index: mk/build/bsd.build-vars.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/build/bsd.build-vars.mk,v
retrieving revision 1.2
diff -u -r1.2 bsd.build-vars.mk
--- mk/build/bsd.build-vars.mk  21 Jul 2006 14:27:56 -0000      1.2
+++ mk/build/bsd.build-vars.mk  3 Sep 2006 11:50:33 -0000
@@ -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}}
Index: mk/build/build.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/build/build.mk,v
retrieving revision 1.5
diff -u -r1.5 build.mk
--- mk/build/build.mk   22 Jul 2006 16:31:35 -0000      1.5
+++ mk/build/build.mk   3 Sep 2006 11:50:33 -0000
@@ -3,7 +3,7 @@
 # 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

Index: mk/build/test.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/build/test.mk,v
retrieving revision 1.6
diff -u -r1.6 test.mk
--- mk/build/test.mk    22 Jul 2006 16:31:35 -0000      1.6
+++ mk/build/test.mk    3 Sep 2006 11:50:33 -0000
@@ -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:
Index: mk/install/install.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/install/install.mk,v
retrieving revision 1.17
diff -u -r1.17 install.mk
--- mk/install/install.mk       9 Aug 2006 15:25:49 -0000       1.17
+++ mk/install/install.mk       3 Sep 2006 11:50:33 -0000
@@ -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