Invent ZOULARISBASE, defaulting to $LOCALBASE/bsd, to make it possible

to setup Zoularis (or similar :-) environments to be closer to hier(7).

2 files changed, 14 insertions, 12 deletions

diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index a9d4672dd16..3405a3129da 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.713 2001/04/07 12:45:20 dmcmahill Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.714 2001/04/08 14:14:11 hubertf Exp $
 #
 # This file is in the public domain.
 #
@@ -292,8 +292,8 @@ MAKE_ENV+=		PATH=${PATH}:${LOCALBASE}/bin:${X11BASE}/bin PREFIX=${PREFIX} LOCALB
 MAKE_ENV+=		MOTIFLIB="${MOTIFLIB}"
 .endif
 
-.if exists(${LOCALBASE}/bsd/bin/ftp)			# Zoularis
-FETCH_CMD?=		${LOCALBASE}/bsd/bin/ftp
+.if exists(${ZOULARISBASE}/bin/ftp)			# Zoularis
+FETCH_CMD?=		${ZOULARISBASE}/bin/ftp
 .else
 FETCH_CMD?=		/usr/bin/ftp
 .endif
@@ -534,7 +534,7 @@ FALSE?=		/usr/bin/false
 FILE?=		/usr/bin/file
 FIND?=		/usr/bin/find
 GREP?=		/usr/bin/grep
-GTAR?=		${LOCALBASE}/bsd/bin/tar
+GTAR?=		${ZOULARISBASE}/bin/tar
 .if exists(/usr/bin/gzip)
 GUNZIP_CMD?=	/usr/bin/gunzip -f
 GZCAT?=		/usr/bin/gzcat
@@ -552,7 +552,7 @@ LDCONFIG?=	/usr/bin/true
 LN?=		/usr/bin/ln
 LS?=		/usr/bin/ls
 MKDIR?=		/usr/bin/mkdir -p
-MTREE?=		${LOCALBASE}/bsd/bin/mtree
+MTREE?=		${ZOULARISBASE}/bin/mtree
 MV?=		/usr/bin/mv
 .if exists(/usr/bin/gpatch)
 PATCH?=		/usr/bin/gpatch -b
@@ -600,10 +600,10 @@ LDCONFIG?=	/sbin/ldconfig
 LN?=		/bin/ln
 LS?=		/bin/ls
 MKDIR?=		/bin/mkdir -p
-MTREE?=		${LOCALBASE}/bsd/bin/mtree
+MTREE?=		${ZOULARISBASE}/bin/mtree
 MV?=		/bin/mv
 PATCH?=		/usr/bin/patch
-PAX?=		/usr/local/bsd/bin/pax
+PAX?=		${ZOULARISBASE}/bin/pax
 PKGLOCALEDIR?=	share
 RM?=		/bin/rm
 RMDIR?=		/bin/rmdir
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk
index 71078f5917c..4cdba50acc6 100644
--- a/mk/bsd.prefs.mk
+++ b/mk/bsd.prefs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.31 2001/03/24 21:06:52 tron Exp $
+# $NetBSD: bsd.prefs.mk,v 1.32 2001/04/08 14:14:11 hubertf Exp $
 #
 # Make file, included to get the site preferences, if any.  Should
 # only be included by package Makefiles before any .if defined()
@@ -186,9 +186,11 @@ LOCALBASE?=             ${DESTDIR}/usr/pkg
 PKG_TOOLS_BIN?=		/usr/sbin
 .elif (${OPSYS} == "SunOS")
 X11BASE?=               ${DESTDIR}/usr/openwin
-PKG_TOOLS_BIN?=		${LOCALBASE}/bsd/bin
+ZOULARISBASE?=		${LOCALBASE}/bsd
+PKG_TOOLS_BIN?=		${ZOULARISBASE}/bin
 .elif (${OPSYS} == "Linux")
-PKG_TOOLS_BIN?=		${LOCALBASE}/bsd/bin
+ZOULARISBASE?=		${LOCALBASE}/bsd
+PKG_TOOLS_BIN?=		${ZOULARISBASE}/bin
 .endif
 
 LOCALBASE?=		${DESTDIR}/usr/local
@@ -218,10 +220,10 @@ MAKEFLAGS+=	PKGTOOLS_VERSION="${PKGTOOLS_VERSION}"
 .endif
 
 .if (${OPSYS} == SunOS) && !defined(ZOULARIS_VERSION)
-.if !exists(${LOCALBASE}/bsd/share/mk/zoularis.mk)
+.if !exists(${ZOULARISBASE}/share/mk/zoularis.mk)
 ZOULARIS_VERSION=	20000522
 .else
-.include "${LOCALBASE}/bsd/share/mk/zoularis.mk"
+.include "${ZOULARISBASE}/share/mk/zoularis.mk"
 .endif
 MAKEFLAGS+=		ZOULARIS_VERSION="${ZOULARIS_VERSION}"
 .endif