summaryrefslogtreecommitdiff
path: root/dns
diff options
context:
space:
mode:
authorAkinori MUSHA <knu@FreeBSD.org>2002-01-29 11:48:57 +0000
committerAkinori MUSHA <knu@FreeBSD.org>2002-01-29 11:48:57 +0000
commit897d06aa9731645e0a7fa7c315028dcdbfa3c798 (patch)
tree485cefa9621a788f5d27ac4dcab7fc6aa9843be6 /dns
parentUse ${ECHO_CMD} instead of ${ECHO} where you mean the echo command; (diff)
Use ${ECHO_CMD} instead of ${ECHO} where you mean the echo command;
the ECHO macro is set to "echo" by default, but it is set to "true" if make(1) is invoked with the -s option while ECHO_CMD is always set to the echo command.
Notes
Notes: svn path=/head/; revision=53958
Diffstat (limited to 'dns')
-rw-r--r--dns/ddup/Makefile2
-rw-r--r--dns/dhisd/Makefile18
2 files changed, 10 insertions, 10 deletions
diff --git a/dns/ddup/Makefile b/dns/ddup/Makefile
index 22099e710d5b..2b83fa97279d 100644
--- a/dns/ddup/Makefile
+++ b/dns/ddup/Makefile
@@ -32,7 +32,7 @@ post-patch:
pre-build:
${CP} ${FILESDIR}/Makefile ${WRKSRC}/
- ${ECHO} "#define file_name \"${PREFIX}/etc/ddup.conf\"" > ${WRKSRC}/options.h
+ ${ECHO_CMD} "#define file_name \"${PREFIX}/etc/ddup.conf\"" > ${WRKSRC}/options.h
post-install:
${INSTALL_SCRIPT} ${WRKSRC}/ddupcron.sh ${PREFIX}/sbin/
diff --git a/dns/dhisd/Makefile b/dns/dhisd/Makefile
index f41aa96458df..03e6c16643cc 100644
--- a/dns/dhisd/Makefile
+++ b/dns/dhisd/Makefile
@@ -24,23 +24,23 @@ do-install:
post-install:
${ECHO} "===> Installing ${PREFIX}/bin/dhisd."
${INSTALL_PROGRAM} ${WRKSRC}/dhisd ${PREFIX}/bin
- @${ECHO} "bin/dhisd" >> ${TMPPLIST}
+ @${ECH_CMDO} "bin/dhisd" >> ${TMPPLIST}
${ECHO} "===> Installing ${PREFIX}/bin/genkeys."
${INSTALL_PROGRAM} ${WRKSRC}/genkeys ${PREFIX}/bin
- @${ECHO} "bin/genkeys" >> ${TMPPLIST}
+ @${ECH_CMDO} "bin/genkeys" >> ${TMPPLIST}
${ECHO} "===> Creating ${PREFIX}/etc/dhis and installing sample db files."
@${MKDIR} ${PREFIX}/etc/dhis
@${CHMOD} 700 ${PREFIX}/etc/dhis
@${INSTALL_DATA} ${WRKSRC}/dhis.db.sample ${PREFIX}/etc/dhis/dhis.db.sample
- @${ECHO} "etc/dhis/dhis.db.sample" >> ${TMPPLIST}
+ @${ECHO_CMD} "etc/dhis/dhis.db.sample" >> ${TMPPLIST}
@${INSTALL_DATA} ${WRKSRC}/services.db.sample ${PREFIX}/etc/dhis/services.db.sample
- @${ECHO} "etc/dhis/services.db.sample" >> ${TMPPLIST}
+ @${ECHO_CMD} "etc/dhis/services.db.sample" >> ${TMPPLIST}
@${CHMOD} 600 ${PREFIX}/etc/dhis/*
- @${ECHO} "@dirrm etc/dhis" >> ${TMPPLIST}
+ @${ECHO_CMD} "@dirrm etc/dhis" >> ${TMPPLIST}
.if !exists(${PREFIX}/etc/rc.d/dhisd.sh)
${ECHO} "===> Installing ${PREFIX}/etc/rc.d/dhid.sh startup file."
${INSTALL_SCRIPT} -m 751 ${FILESDIR}/dhisd.sh ${PREFIX}/etc/rc.d/dhisd.sh
- @${ECHO} "etc/rc.d/dhisd.sh" >> ${TMPPLIST}
+ @${ECHO_CMD} "etc/rc.d/dhisd.sh" >> ${TMPPLIST}
.endif
.if !defined(NOPORTDOCS)
${ECHO} "===> Installing documentation in ${DOCSDIR}"
@@ -48,11 +48,11 @@ post-install:
@${CHMOD} 755 ${DOCSDIR}
.for DOCFILE in ${DOCFILES}
@${INSTALL_DATA} ${WRKSRC}/${DOCFILE} ${DOCSDIR}
- @${ECHO} "share/doc/${PORTNAME}/${DOCFILE}" >> ${TMPPLIST}
+ @${ECHO_CMD} "share/doc/${PORTNAME}/${DOCFILE}" >> ${TMPPLIST}
.endfor
${INSTALL_DATA} ${FILESDIR}/INSTALL.bsd ${DOCSDIR}
- @${ECHO} "share/doc/${PORTNAME}/INSTALL.bsd" >> ${TMPPLIST}
- @${ECHO} "@dirrm share/doc/${PORTNAME}" >> ${TMPPLIST}
+ @${ECHO_CMD} "share/doc/${PORTNAME}/INSTALL.bsd" >> ${TMPPLIST}
+ @${ECHO_CMD} "@dirrm share/doc/${PORTNAME}" >> ${TMPPLIST}
.endif
@${ECHO} "--------------------------------------------------------------------------"
@${ECHO} "Before dhisd can run, you will need configure BIND."