summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2005-06-14 07:12:23 +0000
committerjlam <jlam@pkgsrc.org>2005-06-14 07:12:23 +0000
commit226567f45c0bf5c05db556f459a8bb92b97717a2 (patch)
tree59fafdfbe4c59863002a612132ee8a43662800ed
parentbb130c5834093b542d6d5131ad4e4fd26a0321a4 (diff)
downloadpkgsrc-226567f45c0bf5c05db556f459a8bb92b97717a2.tar.gz
Make IMAKE_TOOLS into a publicly-readable variable so that it can be
used by pkgtools/xpkgwedge.
-rw-r--r--mk/platform/Linux.mk4
-rw-r--r--mk/tools/imake.mk8
2 files changed, 6 insertions, 6 deletions
diff --git a/mk/platform/Linux.mk b/mk/platform/Linux.mk
index 75416233b47..3de349dab6a 100644
--- a/mk/platform/Linux.mk
+++ b/mk/platform/Linux.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Linux.mk,v 1.15 2005/06/01 18:14:23 jlam Exp $
+# $NetBSD: Linux.mk,v 1.16 2005/06/14 07:12:23 jlam Exp $
#
# Variable definitions for the Linux operating system.
@@ -45,7 +45,7 @@ IMAKE_FILEMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}5
IMAKE_MISCMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}7
IMAKE_MANNEWSUFFIX= ${IMAKE_MAN_SUFFIX}
-_IMAKE_TOOLS= gmake # extra tools required when we use imake
+IMAKE_TOOLS= gmake # extra tools required when we use imake
_DO_SHLIB_CHECKS= no # on installation, fixup PLIST for shared libs
.if exists(/usr/include/netinet6) || exists(/usr/include/linux/in6.h)
_OPSYS_HAS_INET6= yes # IPv6 is standard
diff --git a/mk/tools/imake.mk b/mk/tools/imake.mk
index d4176aa321e..62904e27cea 100644
--- a/mk/tools/imake.mk
+++ b/mk/tools/imake.mk
@@ -1,4 +1,4 @@
-# $NetBSD: imake.mk,v 1.13 2005/05/22 05:21:15 minskim Exp $
+# $NetBSD: imake.mk,v 1.14 2005/06/14 07:12:23 jlam Exp $
#
# Copyright (c) 2005 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -51,8 +51,8 @@
# XMKMF_FLAGS Options to pass to xmkmf
#
# A platform/${OPSYS}.mk file may note that additional tools are
-# required when using imake by setting _IMAKE_TOOLS to the appropriate
-# value, e.g. _IMAKE_TOOLS+=gmake to use GNU make to build packages
+# required when using imake by setting IMAKE_TOOLS to the appropriate
+# value, e.g. IMAKE_TOOLS+=gmake to use GNU make to build packages
# that use imake.
#
# This file needs to be included before replace.mk as it modifies the
@@ -73,7 +73,7 @@ USE_TOOLS+= imake xmkmf
# Add any extra tools that may be required when using imake, e.g. gmake.
.if !empty(USE_TOOLS:Mimake)
-USE_TOOLS+= ${_IMAKE_TOOLS:Nimake}
+USE_TOOLS+= ${IMAKE_TOOLS:Nimake}
.endif
TOOLS_REAL_ARGS.imake?= ${IMAKEOPTS}