Make strip/no-strip choice more consistent:

Move check for INSTALL_UNSTRIPPED to the platform/*.mk files, alongside
existing check for DEBUG_FLAGS.

12 files changed, 23 insertions, 30 deletions

diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 56e9a5e9593..e97ec1e5b6e 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.1516 2004/10/12 18:29:25 tv Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.1517 2004/10/13 15:31:31 tv Exp $
 #
 # This file is in the public domain.
 #
@@ -631,17 +631,10 @@ PKG_FAIL_REASON+='assignment of WRKSRC= $${WRKDIR}'
 .endif # NO_WRKSUBDIR
 
 # A few aliases for *-install targets
-.if !defined(INSTALL_UNSTRIPPED) || empty(INSTALL_UNSTRIPPED:M[yY][eE][sS])
 INSTALL_PROGRAM?= 	\
 	${INSTALL} ${COPY} ${_STRIPFLAG_INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}
 INSTALL_GAME?=		\
 	${INSTALL} ${COPY} ${_STRIPFLAG_INSTALL} -o ${GAMEOWN} -g ${GAMEGRP} -m ${GAMEMODE}
-.else
-INSTALL_PROGRAM?= 	\
-	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}
-INSTALL_GAME?=		\
-	${INSTALL} ${COPY} -o ${GAMEOWN} -g ${GAMEGRP} -m ${GAMEMODE}
-.endif
 INSTALL_SCRIPT?= 	\
 	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}
 INSTALL_LIB?= 		\
diff --git a/mk/platform/AIX.mk b/mk/platform/AIX.mk
index 72370486f59..b873c44c37b 100644
--- a/mk/platform/AIX.mk
+++ b/mk/platform/AIX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: AIX.mk,v 1.1 2004/10/06 20:51:47 jlam Exp $
+# $NetBSD: AIX.mk,v 1.2 2004/10/13 15:31:31 tv Exp $
 #
 # Variable definitions for the AIX operating system.
 
@@ -173,7 +173,7 @@ _OPSYS_NO_WHOLE_ARCHIVE_FLAG=	-Wl,--no-whole-archive
 LINK_ALL_LIBGCC_HACK=	-Wl,--whole-archive -lgcc -Wl,--no-whole-archive
 .endif
 
-.if !defined(DEBUG_FLAGS)
+.if (!defined(INSTALL_UNSTRIPPED) || empty(INSTALL_UNSTRIPPED:M[yY][eE][sS])) && !defined(DEBUG_FLAGS)
 _STRIPFLAG_CC?=		-s	# cc(1) option to strip
 _STRIPFLAG_INSTALL?=	-s	# install(1) option to strip
 .endif
diff --git a/mk/platform/BSDOS.mk b/mk/platform/BSDOS.mk
index 00bd7356165..3b22328f835 100644
--- a/mk/platform/BSDOS.mk
+++ b/mk/platform/BSDOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: BSDOS.mk,v 1.1 2004/10/06 20:51:47 jlam Exp $
+# $NetBSD: BSDOS.mk,v 1.2 2004/10/13 15:31:31 tv Exp $
 #
 # Variable definitions for the BSD/OS operating system.
 
@@ -152,7 +152,7 @@ _USE_RPATH=		yes	# add rpath to LDFLAGS
 _OPSYS_WHOLE_ARCHIVE_FLAG=	-Wl,--whole-archive
 _OPSYS_NO_WHOLE_ARCHIVE_FLAG=	-Wl,--no-whole-archive
 
-.if !defined(DEBUG_FLAGS)
+.if (!defined(INSTALL_UNSTRIPPED) || empty(INSTALL_UNSTRIPPED:M[yY][eE][sS])) && !defined(DEBUG_FLAGS)
 _STRIPFLAG_CC?=		-s	# cc(1) option to strip
 _STRIPFLAG_INSTALL?=	-s	# install(1) option to strip
 .endif
diff --git a/mk/platform/Darwin.mk b/mk/platform/Darwin.mk
index 74ef0223bed..c5c83ea6002 100644
--- a/mk/platform/Darwin.mk
+++ b/mk/platform/Darwin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Darwin.mk,v 1.1 2004/10/06 20:51:47 jlam Exp $
+# $NetBSD: Darwin.mk,v 1.2 2004/10/13 15:31:31 tv Exp $
 #
 # Variable definitions for the Darwin operating system.
 
@@ -146,7 +146,7 @@ _USE_RPATH=		no	# don't add rpath to LDFLAGS
 _OPSYS_WHOLE_ARCHIVE_FLAG=	-Wl,--whole-archive
 _OPSYS_NO_WHOLE_ARCHIVE_FLAG=	-Wl,--no-whole-archive
 
-.if !defined(DEBUG_FLAGS)
+.if (!defined(INSTALL_UNSTRIPPED) || empty(INSTALL_UNSTRIPPED:M[yY][eE][sS])) && !defined(DEBUG_FLAGS)
 _STRIPFLAG_CC?=		-Wl,-x	# cc(1) option to strip
 _STRIPFLAG_INSTALL?=	-s	# install(1) option to strip
 .endif
diff --git a/mk/platform/FreeBSD.mk b/mk/platform/FreeBSD.mk
index f529a3861a4..68b6845387f 100644
--- a/mk/platform/FreeBSD.mk
+++ b/mk/platform/FreeBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: FreeBSD.mk,v 1.1 2004/10/06 20:51:47 jlam Exp $
+# $NetBSD: FreeBSD.mk,v 1.2 2004/10/13 15:31:31 tv Exp $
 #
 # Variable definitions for the FreeBSD operating system.
 
@@ -153,7 +153,7 @@ _USE_RPATH=		yes	# add rpath to LDFLAGS
 _OPSYS_WHOLE_ARCHIVE_FLAG=	-Wl,--whole-archive
 _OPSYS_NO_WHOLE_ARCHIVE_FLAG=	-Wl,--no-whole-archive
 
-.if !defined(DEBUG_FLAGS)
+.if (!defined(INSTALL_UNSTRIPPED) || empty(INSTALL_UNSTRIPPED:M[yY][eE][sS])) && !defined(DEBUG_FLAGS)
 _STRIPFLAG_CC?=		-s	# cc(1) option to strip
 _STRIPFLAG_INSTALL?=	-s	# install(1) option to strip
 .endif
diff --git a/mk/platform/IRIX.mk b/mk/platform/IRIX.mk
index f6a446b3b57..a1fdc095213 100644
--- a/mk/platform/IRIX.mk
+++ b/mk/platform/IRIX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: IRIX.mk,v 1.1 2004/10/06 20:51:47 jlam Exp $
+# $NetBSD: IRIX.mk,v 1.2 2004/10/13 15:31:31 tv Exp $
 #
 # Variable definitions for the IRIX operating system.
 
@@ -154,7 +154,7 @@ _OPSYS_NO_WHOLE_ARCHIVE_FLAG=	-Wl,-none
 # incompatible.
 _INCOMPAT_ICONV=	IRIX-*-*
 
-.if !defined(DEBUG_FLAGS)
+.if (!defined(INSTALL_UNSTRIPPED) || empty(INSTALL_UNSTRIPPED:M[yY][eE][sS])) && !defined(DEBUG_FLAGS)
 _STRIPFLAG_CC?=		-s	# cc(1) option to strip
 _STRIPFLAG_INSTALL?=	-s	# install(1) option to strip
 .endif
diff --git a/mk/platform/Interix.mk b/mk/platform/Interix.mk
index f092db309ff..a6a61350856 100644
--- a/mk/platform/Interix.mk
+++ b/mk/platform/Interix.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Interix.mk,v 1.5 2004/10/12 04:41:39 tv Exp $
+# $NetBSD: Interix.mk,v 1.6 2004/10/13 15:31:31 tv Exp $
 #
 # Variable definitions for the Interix operating system.
 
@@ -155,7 +155,7 @@ BUILD_DEPENDS+=		${USE_X11BASE:D${_XPKGWEDGE_DEPENDS}}
 _OPSYS_WHOLE_ARCHIVE_FLAG=	-Wl,--whole-archive
 _OPSYS_NO_WHOLE_ARCHIVE_FLAG=	-Wl,--no-whole-archive
 
-.if !defined(DEBUG_FLAGS)
+.if (!defined(INSTALL_UNSTRIPPED) || empty(INSTALL_UNSTRIPPED:M[yY][eE][sS])) && !defined(DEBUG_FLAGS)
 _STRIPFLAG_CC?=		-s	# cc(1) option to strip
 _STRIPFLAG_INSTALL?=	-s	# install(1) option to strip
 .endif
diff --git a/mk/platform/Linux.mk b/mk/platform/Linux.mk
index 390ecb6349a..a5559a23574 100644
--- a/mk/platform/Linux.mk
+++ b/mk/platform/Linux.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Linux.mk,v 1.1 2004/10/06 20:51:47 jlam Exp $
+# $NetBSD: Linux.mk,v 1.2 2004/10/13 15:31:31 tv Exp $
 #
 # Variable definitions for the Linux operating system.
 
@@ -185,7 +185,7 @@ _USE_RPATH=		yes	# add rpath to LDFLAGS
 _OPSYS_WHOLE_ARCHIVE_FLAG=	-Wl,--whole-archive
 _OPSYS_NO_WHOLE_ARCHIVE_FLAG=	-Wl,--no-whole-archive
 
-.if !defined(DEBUG_FLAGS)
+.if (!defined(INSTALL_UNSTRIPPED) || empty(INSTALL_UNSTRIPPED:M[yY][eE][sS])) && !defined(DEBUG_FLAGS)
 _STRIPFLAG_CC?=		-s	# cc(1) option to strip
 _STRIPFLAG_INSTALL?=	-s	# install(1) option to strip
 .endif
diff --git a/mk/platform/NetBSD.mk b/mk/platform/NetBSD.mk
index 041d197816b..41d0bc17434 100644
--- a/mk/platform/NetBSD.mk
+++ b/mk/platform/NetBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.mk,v 1.1 2004/10/06 20:51:47 jlam Exp $
+# $NetBSD: NetBSD.mk,v 1.2 2004/10/13 15:31:31 tv Exp $
 #
 # Variable definitions for the NetBSD operating system.
 
@@ -157,7 +157,7 @@ _OPSYS_NO_WHOLE_ARCHIVE_FLAG=	-Wl,--no-whole-archive
 LINK_ALL_LIBGCC_HACK=	-Wl,--whole-archive -lgcc -Wl,--no-whole-archive
 .endif
 
-.if !defined(DEBUG_FLAGS)
+.if (!defined(INSTALL_UNSTRIPPED) || empty(INSTALL_UNSTRIPPED:M[yY][eE][sS])) && !defined(DEBUG_FLAGS)
 _STRIPFLAG_CC?=		-s	# cc(1) option to strip
 _STRIPFLAG_INSTALL?=	-s	# install(1) option to strip
 .endif
diff --git a/mk/platform/OpenBSD.mk b/mk/platform/OpenBSD.mk
index fd8b1915055..50ccd89a8c3 100644
--- a/mk/platform/OpenBSD.mk
+++ b/mk/platform/OpenBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: OpenBSD.mk,v 1.1 2004/10/06 20:51:47 jlam Exp $
+# $NetBSD: OpenBSD.mk,v 1.2 2004/10/13 15:31:31 tv Exp $
 #
 # Variable definitions for the OpenBSD operating system.
 
@@ -145,7 +145,7 @@ _USE_RPATH=		yes	# add rpath to LDFLAGS
 _OPSYS_WHOLE_ARCHIVE_FLAG=	-Wl,--whole-archive
 _OPSYS_NO_WHOLE_ARCHIVE_FLAG=	-Wl,--no-whole-archive
 
-.if !defined(DEBUG_FLAGS)
+.if (!defined(INSTALL_UNSTRIPPED) || empty(INSTALL_UNSTRIPPED:M[yY][eE][sS])) && !defined(DEBUG_FLAGS)
 _STRIPFLAG_CC?=		-s	# cc(1) option to strip
 _STRIPFLAG_INSTALL?=	-s	# install(1) option to strip
 .endif
diff --git a/mk/platform/SunOS.mk b/mk/platform/SunOS.mk
index 715d0a67c8c..ae7cc121c8e 100644
--- a/mk/platform/SunOS.mk
+++ b/mk/platform/SunOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: SunOS.mk,v 1.3 2004/10/12 08:38:19 uebayasi Exp $
+# $NetBSD: SunOS.mk,v 1.4 2004/10/13 15:31:31 tv Exp $
 #
 # Variable definitions for the SunOS/Solaris operating system.
 
@@ -145,7 +145,7 @@ _OPSYS_NO_WHOLE_ARCHIVE_FLAG=	-z defaultextract
 # incompatible.
 _INCOMPAT_ICONV=	SunOS-*-*
 
-.if !defined(DEBUG_FLAGS)
+.if (!defined(INSTALL_UNSTRIPPED) || empty(INSTALL_UNSTRIPPED:M[yY][eE][sS])) && !defined(DEBUG_FLAGS)
 _STRIPFLAG_CC?=		-s	# cc(1) option to strip
 _STRIPFLAG_INSTALL?=	-s	# install(1) option to strip
 .endif
diff --git a/mk/platform/UnixWare.mk b/mk/platform/UnixWare.mk
index b28b52d6560..5fe951eb933 100644
--- a/mk/platform/UnixWare.mk
+++ b/mk/platform/UnixWare.mk
@@ -1,4 +1,4 @@
-# $NetBSD: UnixWare.mk,v 1.1 2004/10/06 20:51:47 jlam Exp $
+# $NetBSD: UnixWare.mk,v 1.2 2004/10/13 15:31:31 tv Exp $
 #
 # Variable definitions for the UnixWare 7 operating system.
 
@@ -148,7 +148,7 @@ _OPSYS_NO_WHOLE_ARCHIVE_FLAG=
 _INCOMPAT_ICONV=	UnixWare-*-*
 
 # XXX Where are those variables used?
-.if !defined(DEBUG_FLAGS)
+.if (!defined(INSTALL_UNSTRIPPED) || empty(INSTALL_UNSTRIPPED:M[yY][eE][sS])) && !defined(DEBUG_FLAGS)
 _STRIPFLAG_CC?=			# cc(1) option to strip
 _STRIPFLAG_INSTALL?=		# install(1) option to strip
 .endif