diff options
| author | jlam <jlam> | 2005-05-16 18:01:12 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2005-05-16 18:01:12 +0000 |
| commit | fbed8d02a24c5bcbd4677c9a6e708590fdbe88a8 (patch) | |
| tree | 5a36426550aa75d547b1a2a1ccb7138a9b9c3634 /mk | |
| parent | 863fd4bc6f6b4ee74556c3067114ed7905679ca8 (diff) | |
| download | pkgsrc-fbed8d02a24c5bcbd4677c9a6e708590fdbe88a8.tar.gz | |
Don't have USE_TOOLS+=imake replace USE_IMAKE. Rather let the former
specify that imake is used by the package, while the latter triggers
the special do-configure process.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 4 | ||||
| -rw-r--r-- | mk/tools/imake.mk | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 917d9922c09..897141b02e0 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1665 2005/05/16 15:20:15 jlam Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1666 2005/05/16 18:01:12 jlam Exp $ # # This file is in the public domain. # @@ -1873,7 +1873,7 @@ do-configure: ${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS} . endfor . endif -. if defined(USE_IMAKE) || !empty(USE_TOOLS:Mimake) +. if defined(USE_IMAKE) . for DIR in ${CONFIGURE_DIRS} ${_PKG_SILENT}${_PKG_DEBUG}cd ${DIR} && ${SETENV} ${SCRIPTS_ENV} XPROJECTROOT=${X11BASE} ${XMKMF} . endfor diff --git a/mk/tools/imake.mk b/mk/tools/imake.mk index d3ad5a2ec12..af6c3b9b3ef 100644 --- a/mk/tools/imake.mk +++ b/mk/tools/imake.mk @@ -1,4 +1,4 @@ -# $NetBSD: imake.mk,v 1.8 2005/05/15 23:27:44 jlam Exp $ +# $NetBSD: imake.mk,v 1.9 2005/05/16 18:01:13 jlam Exp $ # # This Makefile fragment handles packages that need imake and xmkmf # to build X11-related packages. The correct imake and xmkmf tools @@ -33,9 +33,6 @@ # rules as for other replacement tools. # -# Continue to allow USE_IMAKE until packages have been taught to use the -# new syntax. -# .if defined(USE_IMAKE) USE_TOOLS+= imake .endif |