From a82f47c3ceca01e56e137fb34291e3d943a1e23e Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Sat, 30 Apr 2005 15:05:06 +0000
Subject: Avoid checking for !empty(...) so that we that defer variable
 references.

---
 mk/subst.mk | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'mk')

diff --git a/mk/subst.mk b/mk/subst.mk
index fe0ba4f887f..ff162528eec 100644
--- a/mk/subst.mk
+++ b/mk/subst.mk
@@ -1,4 +1,4 @@
-# $NetBSD: subst.mk,v 1.16 2004/08/23 16:37:09 jlam Exp $
+# $NetBSD: subst.mk,v 1.17 2005/04/30 15:05:06 jlam Exp $
 #
 # This Makefile fragment implements a general text replacement facility.
 # Package makefiles define a ``class'', for each of which a paricular
@@ -43,11 +43,7 @@ _SUBST_BACKUP_SUFFIX=	.subst.sav
 .for _class_ in ${SUBST_CLASSES}
 _SUBST_COOKIE.${_class_}=	${WRKDIR}/.subst_${_class_}_done
 
-.  if defined(SUBST_SED.${_class_}) && !empty(SUBST_SED.${_class_})
 SUBST_FILTER_CMD.${_class_}?=	${SED} ${SUBST_SED.${_class_}}
-.  else
-SUBST_FILTER_CMD.${_class_}?=	# empty
-.  endif
 SUBST_POSTCMD.${_class_}?=	${RM} -f $$file${_SUBST_BACKUP_SUFFIX}
 
 SUBST_TARGETS+=			subst-${_class_}
@@ -77,7 +73,6 @@ subst-${_class_}: ${_SUBST_TARGETS.${_class_}}
 	${TOUCH} ${TOUCH_FLAGS} ${_SUBST_COOKIE.${_class_}}
 
 ${_SUBST_COOKIE.${_class_}}:
-.  if !empty(SUBST_FILTER_CMD.${_class_})
 	${_PKG_SILENT}${_PKG_DEBUG}					\
 	cd ${WRKSRC};							\
 	files="${SUBST_FILES.${_class_}}";				\
@@ -101,5 +96,4 @@ ${_SUBST_COOKIE.${_class_}}:
 			fi;						\
 		done ;;							\
 	esac
-.  endif
 .endfor
-- 
cgit v1.2.3