[src/trunk]: src/external/mit/xorg/share/cf Fix generation of site.def to sub...

[dholland <dholland%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/28a428ce260e
branches:  trunk
changeset: 769987:28a428ce260e
user:      dholland <dholland%NetBSD.org@localhost>
date:      Thu Sep 29 09:44:08 2011 +0000

description:
Fix generation of site.def to substitute @FONTROOTDIR@ and @ENCODINGSDIR@
instead of emitting them unchanged into the imake templates. Should fix
build of x3270.

diffstat:

 external/mit/xorg/share/cf/Makefile |  7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diffs (21 lines):

diff -r b39c02afe29f -r 28a428ce260e external/mit/xorg/share/cf/Makefile
--- a/external/mit/xorg/share/cf/Makefile       Thu Sep 29 09:18:17 2011 +0000
+++ b/external/mit/xorg/share/cf/Makefile       Thu Sep 29 09:44:08 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.8 2010/11/27 22:21:27 mrg Exp $
+#      $NetBSD: Makefile,v 1.9 2011/09/29 09:44:08 dholland Exp $
 
 .include <bsd.own.mk>
 
@@ -38,7 +38,10 @@
 
 netbsd.site.def:       site.def.in
        ${_MKTARGET_CREATE}
-       ${TOOL_SED} -e 's,@prefix@,${X11ROOTDIR},' <${.ALLSRC} >${.TARGET}
+       ${TOOL_SED} -e 's,@prefix@,${X11ROOTDIR},' <${.ALLSRC} |\
+          ${TOOL_SED} -e 's,@FONTROOTDIR@,${X11ROOTDIR}/share/fonts/X11,' |\
+          ${TOOL_SED} -e 's,@ENCODINGSDIR@,\$${FONTROOTDIR}/encodings,' \
+          >${.TARGET}
 realall:       netbsd.site.def
 
 .include <bsd.prog.mk>