From bc07afc1c299155a3451d285f1e3c862af0c8e83 Mon Sep 17 00:00:00 2001 From: Akinori MUSHA Date: Tue, 29 Jan 2002 10:53:27 +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. --- games/doom/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'games/doom') diff --git a/games/doom/Makefile b/games/doom/Makefile index 6137f0b5e226..92d4bdd0740c 100644 --- a/games/doom/Makefile +++ b/games/doom/Makefile @@ -36,7 +36,7 @@ do-fetch: DISTFILES="${DISTFILES2}" MASTER_SITES="${MASTER_SITES2}" .endif post-extract: - @cd ${WRKDIR} && tar xzf linuxdoom-1.10.src.tgz && tar xzf sndserv.tgz + @cd ${WRKDIR} && ${TAR} xzf linuxdoom-1.10.src.tgz && ${TAR} xzf sndserv.tgz post-patch: @${FIND} ${WRKSRC} -type f | ${XARGS} ${PERL} -pi -e "s@#include +@#include @g" @@ -49,8 +49,8 @@ do-install: @${MKDIR} ${PREFIX}/libexec/doom ${PREFIX}/share/doom @${INSTALL_PROGRAM} ${WRKDIR}/linuxdoom-1.10/linux/linuxxdoom ${PREFIX}/libexec/doom/xdoom @${INSTALL_PROGRAM} ${WRKDIR}/sndserv/linux/sndserver ${PREFIX}/libexec/doom/sndserver - @(${ECHO} "#!/bin/sh"; ${ECHO} "cd ${PREFIX}/libexec/doom"; \ - ${ECHO} 'export PATH=.:$$PATH';${ECHO} "export DOOMWADDIR=${PREFIX}/share/doom"; ${ECHO} "./xdoom $$*") > ${PREFIX}/bin/doom + @(${ECHO_CMD} "#!/bin/sh"; ${ECHO_CMD} "cd ${PREFIX}/libexec/doom"; \ + ${ECHO_CMD} 'export PATH=.:$$PATH';${ECHO_CMD} "export DOOMWADDIR=${PREFIX}/share/doom"; ${ECHO_CMD} "./xdoom $$*") > ${PREFIX}/bin/doom @${CHMOD} ugo+x ${PREFIX}/bin/doom @${GZCAT} ${DISTDIR}/${DISTFILES2} > ${PREFIX}/share/doom/doom1.wad -- cgit v1.2.3