pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk Avoid checking for !empty(...) so that we that defe...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/f9e58b65aea9
branches:  trunk
changeset: 493232:f9e58b65aea9
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sat Apr 30 15:05:06 2005 +0000

description:
Avoid checking for !empty(...) so that we that defer variable references.

diffstat:

 mk/subst.mk |  8 +-------
 1 files changed, 1 insertions(+), 7 deletions(-)

diffs (35 lines):

diff -r 073eace270c1 -r f9e58b65aea9 mk/subst.mk
--- a/mk/subst.mk       Sat Apr 30 12:25:29 2005 +0000
+++ b/mk/subst.mk       Sat Apr 30 15:05:06 2005 +0000
@@ -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 @@
 .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 @@
        ${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 @@
                        fi;                                             \
                done ;;                                                 \
        esac
-.  endif
 .endfor



Home | Main Index | Thread Index | Old Index