diff options
author | Akinori MUSHA <knu@FreeBSD.org> | 2002-01-29 11:24:09 +0000 |
---|---|---|
committer | Akinori MUSHA <knu@FreeBSD.org> | 2002-01-29 11:24:09 +0000 |
commit | c982f5faf1c27ba011ef14e71aadc2182660d704 (patch) | |
tree | 2b0b412c02b07adeb72e10a7417749a64cea16ec /lang/erlang14 | |
parent | Use ${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=53957
Diffstat (limited to 'lang/erlang14')
-rw-r--r-- | lang/erlang14/Makefile | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/lang/erlang14/Makefile b/lang/erlang14/Makefile index 908e13b33059..9e2f28e59442 100644 --- a/lang/erlang14/Makefile +++ b/lang/erlang14/Makefile @@ -81,8 +81,8 @@ SCRIPT_ENV+= PATH=${PATH}:${JAVABINDIR} # If X11 is not used, skip gs and etk applications. pre-build: .if defined(WITHOUT_X11) - ${ECHO} "WITHOUT_X11 defined" > ${WRKSRC}/lib/gs/SKIP - ${ECHO} "WITHOUT_X11 defined" > ${WRKSRC}/lib/etk/SKIP + ${ECHO_CMD} "WITHOUT_X11 defined" > ${WRKSRC}/lib/gs/SKIP + ${ECHO_CMD} "WITHOUT_X11 defined" > ${WRKSRC}/lib/etk/SKIP .endif # Check if javac is really in ${JAVABINDIR}. @@ -139,20 +139,20 @@ post-install: .endif sslapp=`ls -d ${PREFIX}/lib/erlang/lib/ssl-* | tail -1`; \ cd $$sslapp/priv/obj && ${MAKE} && strip ../bin/ssl_esock - @cd ${PREFIX} ; find lib/erlang/* -type f -o -type l \ + @cd ${PREFIX} ; ${FIND} lib/erlang/* -type f -o -type l \ | ${GREP} -v "^lib/erlang/man" \ | sort \ > ${WRKDIR}/PLIST.lib-erlang - @cd ${PREFIX} ; find lib/erlang/* -type d | sort -r \ + @cd ${PREFIX} ; ${FIND} lib/erlang/* -type d | sort -r \ | ${GREP} -v "^lib/erlang/man" \ | ${SED} -e 's/^/@dirrm /g' \ >> ${WRKDIR}/PLIST.lib-erlang - @${ECHO} "r ${TMPPLIST}" > ${WRKDIR}/ex.script - @${ECHO} "/Insert PLIST.lib-erlang" >> ${WRKDIR}/ex.script - @${ECHO} "d" >> ${WRKDIR}/ex.script - @${ECHO} "r ${WRKDIR}/PLIST.lib-erlang" >> ${WRKDIR}/ex.script - @${ECHO} "x!" >> ${WRKDIR}/ex.script + @${ECHO_CMD} "r ${TMPPLIST}" > ${WRKDIR}/ex.script + @${ECHO_CMD} "/Insert PLIST.lib-erlang" >> ${WRKDIR}/ex.script + @${ECHO_CMD} "d" >> ${WRKDIR}/ex.script + @${ECHO_CMD} "r ${WRKDIR}/PLIST.lib-erlang" >> ${WRKDIR}/ex.script + @${ECHO_CMD} "x!" >> ${WRKDIR}/ex.script @${CP} -p ${TMPPLIST} ${TMPPLIST}.pre-lib-erlang @cd ${WRKDIR} ; ex < ex.script |