From 6ee7fd521ee5f00bddf0678f780cb8b2c75a1d8d Mon Sep 17 00:00:00 2001
From: hubertf <hubertf>
Date: Mon, 9 Feb 1998 00:47:23 +0000
Subject: Fix PR 4884 by replacing STRIP with STRIPFLAG. This addes yet another
 step towards bsd.pkg.mk. :)

---
 mk/bsd.pkg.mk         | 4 ++--
 mk/bsd.pkg.subdir.mk  | 6 +++---
 mk/bsd.port.mk        | 4 ++--
 mk/bsd.port.subdir.mk | 6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'mk')

diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 4169bb00adb..361ab0e6b7d 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,7 +1,7 @@
 #-*- mode: Fundamental; tab-width: 4; -*-
 # ex:ts=4
 #
-#	$NetBSD: bsd.pkg.mk,v 1.43 1998/02/02 08:11:49 hubertf Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.44 1998/02/09 00:47:23 hubertf Exp $
 #
 #	bsd.port.mk - 940820 Jordan K. Hubbard.
 #	This file is in the public domain.
@@ -551,7 +551,7 @@ SHAREMODE = ${DOCMODE}
 
 # A few aliases for *-install targets
 INSTALL_PROGRAM= \
-	${INSTALL} ${COPY} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}
+	${INSTALL} ${COPY} ${STRIPFLAG} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}
 INSTALL_SCRIPT= \
 	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}
 INSTALL_DATA= \
diff --git a/mk/bsd.pkg.subdir.mk b/mk/bsd.pkg.subdir.mk
index c42904c9c30..334d4d13210 100644
--- a/mk/bsd.pkg.subdir.mk
+++ b/mk/bsd.pkg.subdir.mk
@@ -1,6 +1,6 @@
 #	from: @(#)bsd.subdir.mk	5.9 (Berkeley) 2/1/91
 #	Id: bsd.port.subdir.mk,v 1.19 1997/03/09 23:10:56 wosch Exp 
-#	$NetBSD: bsd.pkg.subdir.mk,v 1.7 1998/01/30 14:33:48 agc Exp $
+#	$NetBSD: bsd.pkg.subdir.mk,v 1.8 1998/02/09 00:47:25 hubertf Exp $
 #
 # The include file <bsd.port.subdir.mk> contains the default targets
 # for building ports subdirectories. 
@@ -8,7 +8,7 @@
 #
 # +++ variables +++
 #
-# STRIP		The flag passed to the install program to cause the binary
+# STRIPFLAG	The flag passed to the install program to cause the binary
 #		to be stripped.  This is to be used when building your
 #		own install script so that the entire system can be made
 #		stripped/not-stripped using a single knob. [-s]
@@ -38,7 +38,7 @@
 .MAIN: all
 
 .if !defined(DEBUG_FLAGS)
-STRIP?=	-s
+STRIPFLAG?=	-s
 .endif
 
 .if !defined(OPSYS)	# XXX !!
diff --git a/mk/bsd.port.mk b/mk/bsd.port.mk
index 006b00ed564..08b60a628b0 100644
--- a/mk/bsd.port.mk
+++ b/mk/bsd.port.mk
@@ -1,7 +1,7 @@
 #-*- mode: Fundamental; tab-width: 4; -*-
 # ex:ts=4
 #
-#	$NetBSD: bsd.port.mk,v 1.43 1998/02/02 08:11:49 hubertf Exp $
+#	$NetBSD: bsd.port.mk,v 1.44 1998/02/09 00:47:23 hubertf Exp $
 #
 #	bsd.port.mk - 940820 Jordan K. Hubbard.
 #	This file is in the public domain.
@@ -551,7 +551,7 @@ SHAREMODE = ${DOCMODE}
 
 # A few aliases for *-install targets
 INSTALL_PROGRAM= \
-	${INSTALL} ${COPY} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}
+	${INSTALL} ${COPY} ${STRIPFLAG} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}
 INSTALL_SCRIPT= \
 	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}
 INSTALL_DATA= \
diff --git a/mk/bsd.port.subdir.mk b/mk/bsd.port.subdir.mk
index 2ad949b99bb..16180e2a427 100644
--- a/mk/bsd.port.subdir.mk
+++ b/mk/bsd.port.subdir.mk
@@ -1,6 +1,6 @@
 #	from: @(#)bsd.subdir.mk	5.9 (Berkeley) 2/1/91
 #	Id: bsd.port.subdir.mk,v 1.19 1997/03/09 23:10:56 wosch Exp 
-#	$NetBSD: bsd.port.subdir.mk,v 1.7 1998/01/30 14:33:48 agc Exp $
+#	$NetBSD: bsd.port.subdir.mk,v 1.8 1998/02/09 00:47:25 hubertf Exp $
 #
 # The include file <bsd.port.subdir.mk> contains the default targets
 # for building ports subdirectories. 
@@ -8,7 +8,7 @@
 #
 # +++ variables +++
 #
-# STRIP		The flag passed to the install program to cause the binary
+# STRIPFLAG	The flag passed to the install program to cause the binary
 #		to be stripped.  This is to be used when building your
 #		own install script so that the entire system can be made
 #		stripped/not-stripped using a single knob. [-s]
@@ -38,7 +38,7 @@
 .MAIN: all
 
 .if !defined(DEBUG_FLAGS)
-STRIP?=	-s
+STRIPFLAG?=	-s
 .endif
 
 .if !defined(OPSYS)	# XXX !!
-- 
cgit v1.2.3