Provide default values for various variables if they're not present in

the shell environment array ENVIRON.

5 files changed, 26 insertions, 26 deletions

diff --git a/mk/plist/plist-info.awk b/mk/plist/plist-info.awk
index f2e4b03c7a9..4cb2baae46d 100644
--- a/mk/plist/plist-info.awk
+++ b/mk/plist/plist-info.awk
@@ -1,4 +1,4 @@
-# $NetBSD: plist-info.awk,v 1.3 2006/02/05 16:21:07 rillig Exp $
+# $NetBSD: plist-info.awk,v 1.4 2006/02/07 18:42:38 jlam Exp $
 #
 # Copyright (c) 2006 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -54,11 +54,11 @@
 ###	the path to a "test" binary.
 ###
 BEGIN {
-	INFO_DIR = ENVIRON["INFO_DIR"]
-	LS = ENVIRON["LS"]
-	MANZ = ENVIRON["MANZ"]
-	PREFIX = ENVIRON["PREFIX"]
-	TEST = ENVIRON["TEST"]
+	INFO_DIR = ENVIRON["INFO_DIR"] ? ENVIRON["INFO_DIR"] : "info"
+	LS = ENVIRON["LS"] ? ENVIRON["LS"] : "ls"
+	MANZ = ENVIRON["MANZ"] ? ENVIRON["MANZ"] : "no"
+	PREFIX = ENVIRON["PREFIX"] ? ENVIRON["PREFIX"] : "/usr/pkg"
+	TEST = ENVIRON["TEST"] ? ENVIRON["TEST"] : "test"
 }
 
 ###
diff --git a/mk/plist/plist-libtool.awk b/mk/plist/plist-libtool.awk
index 8120f9e54f2..624d6bbff78 100644
--- a/mk/plist/plist-libtool.awk
+++ b/mk/plist/plist-libtool.awk
@@ -1,4 +1,4 @@
-# $NetBSD: plist-libtool.awk,v 1.1 2006/01/12 23:43:57 jlam Exp $
+# $NetBSD: plist-libtool.awk,v 1.2 2006/02/07 18:42:38 jlam Exp $
 #
 # Copyright (c) 2006 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -54,10 +54,10 @@
 ###
 
 BEGIN {
-	LIBTOOL_EXPAND = ENVIRON["LIBTOOL_EXPAND"]
-	LIBTOOLIZE_PLIST = ENVIRON["LIBTOOLIZE_PLIST"]
-	PREFIX = ENVIRON["PREFIX"]
-	TEST = ENVIRON["TEST"]
+	LIBTOOL_EXPAND = ENVIRON["LIBTOOL_EXPAND"] ? ENVIRON["LIBTOOL_EXPAND"] : "/usr/pkgsrc/mk/plist/libtool-expand"
+	LIBTOOLIZE_PLIST = ENVIRON["LIBTOOLIZE_PLIST"] ? ENVIRON["LIBTOOLIZE_PLIST"] : "yes"
+	PREFIX = ENVIRON["PREFIX"] ? ENVIRON["PREFIX"] : "/usr/pkg"
+	TEST = ENVIRON["TEST"] ? ENVIRON["TEST"] : "test"
 }
 
 ###
diff --git a/mk/plist/plist-man.awk b/mk/plist/plist-man.awk
index 6537554ad25..43b108e84d7 100644
--- a/mk/plist/plist-man.awk
+++ b/mk/plist/plist-man.awk
@@ -1,4 +1,4 @@
-# $NetBSD: plist-man.awk,v 1.3 2006/02/05 16:21:07 rillig Exp $
+# $NetBSD: plist-man.awk,v 1.4 2006/02/07 18:42:38 jlam Exp $
 #
 # Copyright (c) 2006 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -64,10 +64,10 @@
 ### PKGMANDIR is the ${PREFIX}-relative path to the installed man pages.
 ###
 BEGIN {
-	IMAKE_MANINSTALL = ENVIRON["IMAKE_MANINSTALL"]
-	MANINSTALL = ENVIRON["MANINSTALL"]
-	MANZ = ENVIRON["MANZ"]
-	PKGMANDIR = ENVIRON["PKGMANDIR"]
+	IMAKE_MANINSTALL = ENVIRON["IMAKE_MANINSTALL"] ? ENVIRON["IMAKE_MANINSTALL"] : "maninstall catinstall"
+	MANINSTALL = ENVIRON["MANINSTALL"] ? ENVIRON["MANINSTALL"] : "maninstall catinstall"
+	MANZ = ENVIRON["MANZ"] ? ENVIRON["MANZ"] : "no"
+	PKGMANDIR = ENVIRON["PKGMANDIR"] ? ENVIRON["PKGMANDIR"] : "man"
 }
 
 ###
diff --git a/mk/plist/shlib-aout.awk b/mk/plist/shlib-aout.awk
index 0bf55239e05..0c653dc30a5 100644
--- a/mk/plist/shlib-aout.awk
+++ b/mk/plist/shlib-aout.awk
@@ -1,4 +1,4 @@
-# $NetBSD: shlib-aout.awk,v 1.2 2006/02/05 16:21:07 rillig Exp $
+# $NetBSD: shlib-aout.awk,v 1.3 2006/02/07 18:42:38 jlam Exp $
 #
 # Copyright (c) 2006 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -41,10 +41,10 @@
 #
 
 BEGIN {
-	LIBTOOL_EXPAND = ENVIRON["LIBTOOL_EXPAND"]
-	LIBTOOLIZE_PLIST = ENVIRON["LIBTOOLIZE_PLIST"]
-	PREFIX = ENVIRON["PREFIX"]
-	TEST = ENVIRON["TEST"]
+	LIBTOOL_EXPAND = ENVIRON["LIBTOOL_EXPAND"] ? ENVIRON["LIBTOOL_EXPAND"] : "/usr/pkgsrc/mk/plist/libtool-expand"
+	LIBTOOLIZE_PLIST = ENVIRON["LIBTOOLIZE_PLIST"] ? ENVIRON["LIBTOOLIZE_PLIST"] : "yes"
+	PREFIX = ENVIRON["PREFIX"] ? ENVIRON["PREFIX"] : "/usr/pkg"
+	TEST = ENVIRON["TEST"] ? ENVIRON["TEST"] : "test"
 	nentries = 0
 }
 
diff --git a/mk/plist/shlib-dylib.awk b/mk/plist/shlib-dylib.awk
index 2a813f44cbb..5640f2acc40 100644
--- a/mk/plist/shlib-dylib.awk
+++ b/mk/plist/shlib-dylib.awk
@@ -1,4 +1,4 @@
-# $NetBSD: shlib-dylib.awk,v 1.2 2006/02/05 16:21:07 rillig Exp $
+# $NetBSD: shlib-dylib.awk,v 1.3 2006/02/07 18:42:38 jlam Exp $
 #
 # Copyright (c) 2006 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -41,10 +41,10 @@
 #
 
 BEGIN {
-	LIBTOOL_EXPAND = ENVIRON["LIBTOOL_EXPAND"]
-	LIBTOOLIZE_PLIST = ENVIRON["LIBTOOLIZE_PLIST"]
-	PREFIX = ENVIRON["PREFIX"]
-	TEST = ENVIRON["TEST"]
+	LIBTOOL_EXPAND = ENVIRON["LIBTOOL_EXPAND"] ? ENVIRON["LIBTOOL_EXPAND"] : "/usr/pkgsrc/mk/plist/libtool-expand"
+	LIBTOOLIZE_PLIST = ENVIRON["LIBTOOLIZE_PLIST"] ? ENVIRON["LIBTOOLIZE_PLIST"] : "yes"
+	PREFIX = ENVIRON["PREFIX"] ? ENVIRON["PREFIX"] : "/usr/pkg"
+	TEST = ENVIRON["TEST"] ? ENVIRON["TEST"] : "test"
 	nentries = 0
 }