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.

Use command macros where appropriate.
This commit is contained in:
Akinori MUSHA 2002-01-29 09:39:59 +00:00
parent d5819cf547
commit 8fdfd13285
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=53948
6 changed files with 26 additions and 26 deletions

View file

@ -17,12 +17,12 @@ do-install:
-${MKDIR} $(PREFIX)/lib/bytebench -${MKDIR} $(PREFIX)/lib/bytebench
for f in Makefile README Run doc pgms results testdir; \ for f in Makefile README Run doc pgms results testdir; \
do ${CP} -R $(WRKSRC)/$$f $(PREFIX)/lib/bytebench; done do ${CP} -R $(WRKSRC)/$$f $(PREFIX)/lib/bytebench; done
${ECHO} "#!/bin/sh" > $(PREFIX)/bin/bytebench ${ECHO_CMD} "#!/bin/sh" > $(PREFIX)/bin/bytebench
${ECHO} "TMPDIR=\$${TMPDIR-/var/tmp}" >> $(PREFIX)/bin/bytebench ${ECHO_CMD} "TMPDIR=\$${TMPDIR-/var/tmp}" >> $(PREFIX)/bin/bytebench
${ECHO} "RESULTDIR=/tmp" >> $(PREFIX)/bin/bytebench ${ECHO_CMD} "RESULTDIR=/tmp" >> $(PREFIX)/bin/bytebench
${ECHO} "export TMPDIR RESULTDIR" >> $(PREFIX)/bin/bytebench ${ECHO_CMD} "export TMPDIR RESULTDIR" >> $(PREFIX)/bin/bytebench
${ECHO} "cd $(PREFIX)/lib/bytebench" >> $(PREFIX)/bin/bytebench ${ECHO_CMD} "cd $(PREFIX)/lib/bytebench" >> $(PREFIX)/bin/bytebench
${ECHO} "exec ./Run \"\$$@\"" >> $(PREFIX)/bin/bytebench ${ECHO_CMD} "exec ./Run \"\$$@\"" >> $(PREFIX)/bin/bytebench
${CHMOD} 755 $(PREFIX)/bin/bytebench ${CHMOD} 755 $(PREFIX)/bin/bytebench
${CHMOD} 644 $(PREFIX)/lib/bytebench/Makefile ${CHMOD} 644 $(PREFIX)/lib/bytebench/Makefile
${CHMOD} 644 $(PREFIX)/lib/bytebench/README ${CHMOD} 644 $(PREFIX)/lib/bytebench/README

View file

@ -17,12 +17,12 @@ do-install:
-${MKDIR} $(PREFIX)/lib/bytebench -${MKDIR} $(PREFIX)/lib/bytebench
for f in Makefile README Run doc pgms results testdir; \ for f in Makefile README Run doc pgms results testdir; \
do ${CP} -R $(WRKSRC)/$$f $(PREFIX)/lib/bytebench; done do ${CP} -R $(WRKSRC)/$$f $(PREFIX)/lib/bytebench; done
${ECHO} "#!/bin/sh" > $(PREFIX)/bin/bytebench ${ECHO_CMD} "#!/bin/sh" > $(PREFIX)/bin/bytebench
${ECHO} "TMPDIR=\$${TMPDIR-/var/tmp}" >> $(PREFIX)/bin/bytebench ${ECHO_CMD} "TMPDIR=\$${TMPDIR-/var/tmp}" >> $(PREFIX)/bin/bytebench
${ECHO} "RESULTDIR=/tmp" >> $(PREFIX)/bin/bytebench ${ECHO_CMD} "RESULTDIR=/tmp" >> $(PREFIX)/bin/bytebench
${ECHO} "export TMPDIR RESULTDIR" >> $(PREFIX)/bin/bytebench ${ECHO_CMD} "export TMPDIR RESULTDIR" >> $(PREFIX)/bin/bytebench
${ECHO} "cd $(PREFIX)/lib/bytebench" >> $(PREFIX)/bin/bytebench ${ECHO_CMD} "cd $(PREFIX)/lib/bytebench" >> $(PREFIX)/bin/bytebench
${ECHO} "exec ./Run \"\$$@\"" >> $(PREFIX)/bin/bytebench ${ECHO_CMD} "exec ./Run \"\$$@\"" >> $(PREFIX)/bin/bytebench
${CHMOD} 755 $(PREFIX)/bin/bytebench ${CHMOD} 755 $(PREFIX)/bin/bytebench
${CHMOD} 644 $(PREFIX)/lib/bytebench/Makefile ${CHMOD} 644 $(PREFIX)/lib/bytebench/Makefile
${CHMOD} 644 $(PREFIX)/lib/bytebench/README ${CHMOD} 644 $(PREFIX)/lib/bytebench/README

View file

@ -25,17 +25,17 @@ pre-build:
${CXX} ${CXXFLAGS} -O0 -c -DRINGHOME="\"${PREFIX}/share/xdrawchem/\"" -I${X11BASE}/include/qt2 -o molecule_tools.o molecule_tools.cpp ${CXX} ${CXXFLAGS} -O0 -c -DRINGHOME="\"${PREFIX}/share/xdrawchem/\"" -I${X11BASE}/include/qt2 -o molecule_tools.o molecule_tools.cpp
pre-install: pre-install:
${ECHO} bin/xdrawchem > ${PLIST} ${ECHO_CMD} bin/xdrawchem > ${PLIST}
${LS} ${WRKSRC}/ring | \ ${LS} ${WRKSRC}/ring | \
${SED} -e 's:^:share/xdrawchem/:' >> ${PLIST} ${SED} -e 's:^:share/xdrawchem/:' >> ${PLIST}
${ECHO} @dirrm share/xdrawchem >> ${PLIST} ${ECHO_CMD} @dirrm share/xdrawchem >> ${PLIST}
.if !defined(NOPORTDOCS) .if !defined(NOPORTDOCS)
cd ${WRKSRC} && ${LS} *txt | \ cd ${WRKSRC} && ${LS} *txt | \
${SED} -e 's:^:share/doc/xdrawchem/:' >> ${PLIST} ${SED} -e 's:^:share/doc/xdrawchem/:' >> ${PLIST}
${ECHO} @dirrm share/doc/xdrawchem >> ${PLIST} ${ECHO_CMD} @dirrm share/doc/xdrawchem >> ${PLIST}
${LS} ${WRKSRC}/save | \ ${LS} ${WRKSRC}/save | \
${SED} -e 's:^:share/examples/xdrawchem/:' >> ${PLIST} ${SED} -e 's:^:share/examples/xdrawchem/:' >> ${PLIST}
${ECHO} @dirrm share/examples/xdrawchem >> ${PLIST} ${ECHO_CMD} @dirrm share/examples/xdrawchem >> ${PLIST}
.endif .endif
do-install: do-install:

View file

@ -28,8 +28,8 @@ pre-patch:
${PATCH} -sp1 < ${.CURDIR}/files/emacs20-xim-20000713.diff ; ) ${PATCH} -sp1 < ${.CURDIR}/files/emacs20-xim-20000713.diff ; )
post-patch: post-patch:
@${ECHO} "share/emacs/%%EMACS_VER%%/etc/Emacs" >> ${WRKDIR}/pkg-plist @${ECHO_CMD} "share/emacs/%%EMACS_VER%%/etc/Emacs" >> ${WRKDIR}/pkg-plist
@${ECHO} "share/emacs/%%EMACS_VER%%/etc/dot.emacs" >> ${WRKDIR}/pkg-plist @${ECHO_CMD} "share/emacs/%%EMACS_VER%%/etc/dot.emacs" >> ${WRKDIR}/pkg-plist
@${CAT} ${MASTERDIR}/pkg-plist >> ${WRKDIR}/pkg-plist @${CAT} ${MASTERDIR}/pkg-plist >> ${WRKDIR}/pkg-plist
post-install: post-install:

View file

@ -20,7 +20,7 @@ PLIST= ${WRKDIR}/pkg-plist
PKGMESSAGE= ${.CURDIR}/pkg-message PKGMESSAGE= ${.CURDIR}/pkg-message
post-patch: post-patch:
@${ECHO} "share/enscript/README.BIG5" > ${WRKDIR}/pkg-plist @${ECHO_CMD} "share/enscript/README.BIG5" > ${WRKDIR}/pkg-plist
@${CAT} ${MASTERDIR}/pkg-plist >> ${WRKDIR}/pkg-plist @${CAT} ${MASTERDIR}/pkg-plist >> ${WRKDIR}/pkg-plist
do-install: do-install:

View file

@ -25,12 +25,12 @@ post-install:
${ECHO} "Installing ${PREFIX}/etc/rc.d/bbs.sh.example startup file."; \ ${ECHO} "Installing ${PREFIX}/etc/rc.d/bbs.sh.example startup file."; \
${INSTALL_SCRIPT} -m 751 ${FILESDIR}/bbs.sh.example ${PREFIX}/etc/rc.d/bbs.sh.example; \ ${INSTALL_SCRIPT} -m 751 ${FILESDIR}/bbs.sh.example ${PREFIX}/etc/rc.d/bbs.sh.example; \
fi fi
@echo "=======================================================================" @${ECHO} "======================================================================="
@echo "Installnation Complete." @${ECHO} "Installnation Complete."
@echo "=======================================================================" @${ECHO} "======================================================================="
@echo "please review ${PREFIX}/etc/rc.d/bbs.sh.example change bbsd port you want" @${ECHO} "please review ${PREFIX}/etc/rc.d/bbs.sh.example change bbsd port you want"
@echo "then rename to ${PREFIX}/etc/rc.d/bbs.sh then:" @${ECHO} "then rename to ${PREFIX}/etc/rc.d/bbs.sh then:"
@echo "use ${PREFIX}/etc/rc.d/bbs.sh { start | stop } to start the BBS service" @${ECHO} "use ${PREFIX}/etc/rc.d/bbs.sh { start | stop } to start the BBS service"
@echo "full and complete document in ${PREFIX}/bbs/bbssrc/doc read before ask." @${ECHO} "full and complete document in ${PREFIX}/bbs/bbssrc/doc read before ask."
.include <bsd.port.mk> .include <bsd.port.mk>