pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/mail/qmail Use :sh instead of != to assign QUEUE_EXTRA...



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

description:
Use :sh instead of != to assign QUEUE_EXTRALEN to defer evalutation of
command until it is referenced within subst.mk's make targets.  This
avoids needing ${EXPR} and ${WC} in the top-level make.

diffstat:

 mail/qmail/Makefile |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (23 lines):

diff -r f9e58b65aea9 -r 8fcfda8f9cc7 mail/qmail/Makefile
--- a/mail/qmail/Makefile       Sat Apr 30 15:05:06 2005 +0000
+++ b/mail/qmail/Makefile       Sat Apr 30 15:06:58 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2005/04/11 21:46:23 tv Exp $
+# $NetBSD: Makefile,v 1.34 2005/04/30 15:06:58 jlam Exp $
 #
 
 DISTNAME=              netqmail-1.05
@@ -81,11 +81,11 @@
 
 .if !empty(QMAIL_QUEUE_EXTRA)
 QUEUE_EXTRA=           "T${QMAIL_QUEUE_EXTRA}\\0"
-QUEUE_EXTRALEN!=       ${EXPR} `${ECHO} ${QUEUE_EXTRA} | ${WC} -c` - 2
+QUEUE_EXTRALEN_cmd=    ${EXPR} `${ECHO} ${QUEUE_EXTRA} | ${WC} -c` - 2
 SUBST_CLASSES+=                logging
 SUBST_STAGE.logging=   do-configure
 SUBST_FILES.logging=   extra.h
-SUBST_SED.logging=     -e 's|0|${QUEUE_EXTRALEN}|g'
+SUBST_SED.logging=     -e 's|0|${QUEUE_EXTRALEN_cmd:sh}|g'
 SUBST_SED.logging+=    -e 's|""|${QUEUE_EXTRA}|g'
 SUBST_MESSAGE.logging= "Setting QUEUE_EXTRA."
 .endif



Home | Main Index | Thread Index | Old Index