From c982f5faf1c27ba011ef14e71aadc2182660d704 Mon Sep 17 00:00:00 2001 From: Akinori MUSHA Date: Tue, 29 Jan 2002 11:24:09 +0000 Subject: 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. --- lang/smarteiffel/Makefile | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'lang/smarteiffel') diff --git a/lang/smarteiffel/Makefile b/lang/smarteiffel/Makefile index fa6c73159dae..486ca3aa9e6b 100644 --- a/lang/smarteiffel/Makefile +++ b/lang/smarteiffel/Makefile @@ -34,8 +34,8 @@ PKGINSTALL= ${WRKDIR}/INSTALL # Make sure we can set the symbolic link SmallEiffel # to the actual release directory. do-install: - @(if test -e ${ALIASDIR} ; then \ - if ! test -L ${ALIASDIR} ; then \ + @(if ${TEST} -e ${ALIASDIR} ; then \ + if ! ${TEST} -L ${ALIASDIR} ; then \ ${ECHO} "Make sure ${ALIASDIR} is a symbolic link"; \ ${ECHO} "or does not exist. This directory will point to "; \ ${ECHO} "the actual SmallEiffel installation directory."; \ @@ -44,16 +44,16 @@ do-install: ${RM} ${ALIASDIR}; \ fi; \ ${LN} -fs ${SEDIR} ${ALIASDIR}) - @(if test -e ${SEDIR} ; then ${RM} -rf ${SEDIR}; fi; \ + @(if ${TEST} -e ${SEDIR} ; then ${RM} -rf ${SEDIR}; fi; \ ${MKDIR} ${SEDIR}; \ ${CP} -pR ${WRKSRC}/* ${SEDIR}; \ - ${ECHO} ./ > ${SEDIR}/sys/loadpath.UNIX; \ - ${ECHO} ${SEDIR}/lib_std/ >> ${SEDIR}/sys/loadpath.UNIX; \ - ${ECHO} ${SEDIR}/lib_iterator/ >> ${SEDIR}/sys/loadpath.UNIX; \ - ${ECHO} ${SEDIR}/lib_random/ >> ${SEDIR}/sys/loadpath.UNIX; \ - ${ECHO} ${SEDIR}/lib_number/ >> ${SEDIR}/sys/loadpath.UNIX; \ - ${ECHO} ${SEDIR}/lib_show/ >> ${SEDIR}/sys/loadpath.UNIX; \ - ${ECHO} ${SEDIR}/lib_se/ >> ${SEDIR}/sys/loadpath.UNIX) + ${ECHO_CMD} ./ > ${SEDIR}/sys/loadpath.UNIX; \ + ${ECHO_CMD} ${SEDIR}/lib_std/ >> ${SEDIR}/sys/loadpath.UNIX; \ + ${ECHO_CMD} ${SEDIR}/lib_iterator/ >> ${SEDIR}/sys/loadpath.UNIX; \ + ${ECHO_CMD} ${SEDIR}/lib_random/ >> ${SEDIR}/sys/loadpath.UNIX; \ + ${ECHO_CMD} ${SEDIR}/lib_number/ >> ${SEDIR}/sys/loadpath.UNIX; \ + ${ECHO_CMD} ${SEDIR}/lib_show/ >> ${SEDIR}/sys/loadpath.UNIX; \ + ${ECHO_CMD} ${SEDIR}/lib_se/ >> ${SEDIR}/sys/loadpath.UNIX) @${SED} -e "s,%%PREFIX%%,${PREFIX},g" ${PKGDIR}/pkg-message \ > ${PKGMESSAGE} @${SED} -e "s,%%PREFIX%%,${PREFIX},g" ${PKGDIR}/pkg-install \ -- cgit v1.2.3