[pkgsrc/trunk]: pkgsrc/x11/imake Completed the last change. It could have fai...

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/fc7cde471c05
branches:  trunk
changeset: 496962:fc7cde471c05
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sun Jul 17 21:57:52 2005 +0000

description:
Completed the last change. It could have failed if NONBINMODE was 444.

diffstat:

 x11/imake/Makefile |  17 +++++++----------
 1 files changed, 7 insertions(+), 10 deletions(-)

diffs (32 lines):

diff -r 56bc300fa285 -r fc7cde471c05 x11/imake/Makefile
--- a/x11/imake/Makefile        Sun Jul 17 21:47:00 2005 +0000
+++ b/x11/imake/Makefile        Sun Jul 17 21:57:52 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/07/17 21:47:00 rillig Exp $
+# $NetBSD: Makefile,v 1.19 2005/07/17 21:57:52 rillig Exp $
 
 DISTNAME=      ${DISTFILES}
 PKGNAME=       imake-${XF_VER}
@@ -64,16 +64,13 @@
        ${_PKG_SILENT}${_PKG_DEBUG}                                     \
        hostdef=${X11ROOT:Q}/lib/X11/config/host.def;                   \
        hosttmp=${WRKSRC:Q}/host.def.tmp;                               \
-       ${SED} -e "s|\#define ProjectRoot ${X11ROOT}||"                 \
-               "$${hostdef}" > "$${hosttmp}";                          \
+       (${SED} -e "s|\#define ProjectRoot ${X11ROOT}||" "$${hostdef}"; \
+        ${ECHO} "";                                                    \
+        ${ECHO} "#ifdef BeforeVendorCF";                               \
+        ${ECHO} "#define ProjectRoot ${X11ROOT}";                      \
+        ${ECHO} "#endif";                                              \
+       )> "$${hosttmp}";                                               \
        ${INSTALL_DATA} "$${hosttmp}" "$${hostdef}";                    \
        ${RM} -f "$${hosttmp}"
 
-       @( \
-       ${ECHO};                                        \
-       ${ECHO} "#ifdef BeforeVendorCF";                \
-       ${ECHO} "#define ProjectRoot ${X11ROOT}";       \
-       ${ECHO} "#endif";                               \
-       ) >> ${X11ROOT}/lib/X11/config/host.def
-
 .include "../../mk/bsd.pkg.mk"