Module Name: src
Committed By: dholland
Date: Thu Sep 29 09:44:09 UTC 2011
Modified Files:
src/external/mit/xorg/share/cf: Makefile
Log Message:
Fix generation of site.def to substitute @FONTROOTDIR@ and @ENCODINGSDIR@
instead of emitting them unchanged into the imake templates. Should fix
build of x3270.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/share/cf/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/share/cf/Makefile
diff -u src/external/mit/xorg/share/cf/Makefile:1.8 src/external/mit/xorg/share/cf/Makefile:1.9
--- src/external/mit/xorg/share/cf/Makefile:1.8 Sat Nov 27 22:21:27 2010
+++ src/external/mit/xorg/share/cf/Makefile Thu Sep 29 09:44:08 2011
@@ -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 @@ CLEANFILES+= netbsd.site.def
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>
