summaryrefslogtreecommitdiff
path: root/ftp
diff options
context:
space:
mode:
authorAkinori MUSHA <knu@FreeBSD.org>2002-01-29 10:53:27 +0000
committerAkinori MUSHA <knu@FreeBSD.org>2002-01-29 10:53:27 +0000
commitbc07afc1c299155a3451d285f1e3c862af0c8e83 (patch)
tree1fecad8c5762f1c1f723e927775d4b37b5a0f7d9 /ftp
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. Use command macros where appropriate.
Notes
Notes: svn path=/head/; revision=53954
Diffstat (limited to 'ftp')
-rw-r--r--ftp/sftp/Makefile4
-rw-r--r--ftp/vsftpd/Makefile2
2 files changed, 3 insertions, 3 deletions
diff --git a/ftp/sftp/Makefile b/ftp/sftp/Makefile
index 998eb2cd4152..0a8eaec0b21b 100644
--- a/ftp/sftp/Makefile
+++ b/ftp/sftp/Makefile
@@ -36,8 +36,8 @@ do-install:
${ECHO} "No other sftp found, linking sftp to secftp"; \
${LN} -s ${PREFIX}/bin/secftp ${PREFIX}/bin/sftp; \
${LN} -s ${PREFIX}/man/man1/secftp.1.gz ${PREFIX}/man/man1/sftp.1.gz; \
- ${ECHO} bin/sftp >> ${PLIST}.unsorted; \
- ${ECHO} man/man1/sftp.1.gz >> ${PLIST}.unsorted; \
+ ${ECHO_CMD} bin/sftp >> ${PLIST}.unsorted; \
+ ${ECHO_CMD} man/man1/sftp.1.gz >> ${PLIST}.unsorted; \
else \
${ECHO} "Other sftp found, not linking sftp to secftp"; \
fi
diff --git a/ftp/vsftpd/Makefile b/ftp/vsftpd/Makefile
index 85258a7d81ca..757099f86f5c 100644
--- a/ftp/vsftpd/Makefile
+++ b/ftp/vsftpd/Makefile
@@ -22,7 +22,7 @@ post-patch:
@${PERL} -pi -e 's@/etc/vsftpd.conf@${PREFIX}/etc/vsftpd.conf@' \
${WRKSRC}/defs.h
@${PERL} -pi -e 's@ -ldl@@; s@^CFLAGS.*$$@@' ${WRKSRC}/Makefile
- @${ECHO} "secure_chroot_dir=${PREFIX}/share/vsftpd/empty" >> \
+ @${ECHO_CMD} "secure_chroot_dir=${PREFIX}/share/vsftpd/empty" >> \
${WRKSRC}/vsftpd.conf
do-install: