Avoid checking whether PKG_OPTIONS_DEPRECATED_WARNINGS is defined in

the makefile and simply handle it in the shell code.  This allows for
appending to PKG_OPTIONS_DEPRECATED_WARNINGS in a makefile even after
bsd.options.mk is included.

1 files changed, 9 insertions, 9 deletions

diff --git a/mk/bsd.options.mk b/mk/bsd.options.mk
index 874b4dcca8c..a5856c077aa 100644
--- a/mk/bsd.options.mk
+++ b/mk/bsd.options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.options.mk,v 1.60 2007/06/06 07:12:31 rillig Exp $
+# $NetBSD: bsd.options.mk,v 1.61 2007/08/14 19:03:25 jlam Exp $
 #
 # This Makefile fragment provides boilerplate code for standard naming
 # conventions for handling per-package build options.
@@ -386,13 +386,13 @@ show-options:
 	@${ECHO} ""
 	@${ECHO} "You can select which build options to use by setting PKG_DEFAULT_OPTIONS"
 	@${ECHO} "or "${PKG_OPTIONS_VAR:Q}"."
-.if defined(PKG_OPTIONS_DEPRECATED_WARNINGS)
-	@${ECHO}
-	@for l in ${PKG_OPTIONS_DEPRECATED_WARNINGS}; \
+	@set -- dummy ${PKG_OPTIONS_DEPRECATED_WARNINGS}; \
+	if ${TEST} $$# -gt 1; then ${ECHO}; fi; \
+	for l; \
 	do \
+		if ${TEST} "$$l" = "dummy"; then continue; fi; \
 		${ECHO} "$$l"; \
 	done
-.endif
 
 .if defined(PKG_SUPPORTED_OPTIONS)
 .PHONY: supported-options-message
@@ -418,13 +418,13 @@ supported-options-message:
 .    else
 	@${ECHO} "	${PKG_OPTIONS_VAR} = "${${PKG_OPTIONS_VAR}:Q}
 .    endif
-.    if defined(PKG_OPTIONS_DEPRECATED_WARNINGS)
-	@${ECHO}
-	@for l in ${PKG_OPTIONS_DEPRECATED_WARNINGS}; \
+	@set -- dummy ${PKG_OPTIONS_DEPRECATED_WARNINGS}; \
+	if ${TEST} $$# -gt 1; then ${ECHO}; fi; \
+	for l; \
 	do \
+		if ${TEST} "$$l" = "dummy"; then continue; fi; \
 		${ECHO} "$$l"; \
 	done
-.    endif
 	@${ECHO} ""
 	@${ECHO} "=========================================================================="
 .  endif