Sun Sep 7 13:10:22 2008 UTC ()
add XLOCALE.DEFINES for locale path defs, easier to manage them here
than deep in the reachover.


(rtr)
diff -r1.61 -r1.62 src/share/mk/bsd.x11.mk
cvs diff -r1.61 -r1.62 src/share/mk/bsd.x11.mk (expand / switch to unified diff)

--- src/share/mk/bsd.x11.mk 2008/08/28 23:32:51 1.61
+++ src/share/mk/bsd.x11.mk 2008/09/07 13:10:22 1.62
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bsd.x11.mk,v 1.61 2008/08/28 23:32:51 lukem Exp $ 1# $NetBSD: bsd.x11.mk,v 1.62 2008/09/07 13:10:22 rtr Exp $
2 2
3.include <bsd.init.mk> 3.include <bsd.init.mk>
4 4
5.if make(depend) || make(all) || make(dependall) 5.if make(depend) || make(all) || make(dependall)
6.if (${MKX11} != "no" && ${MKXORG} != "no") 6.if (${MKX11} != "no" && ${MKXORG} != "no")
7.BEGIN: 7.BEGIN:
8 @echo 8 @echo
9 @echo "ERROR: \$$MKX11 and \$$MKXORG are mutually exclusive." 9 @echo "ERROR: \$$MKX11 and \$$MKXORG are mutually exclusive."
10 @echo 10 @echo
11 @false 11 @false
12.endif 12.endif
13.endif 13.endif
14 14
@@ -126,26 +126,28 @@ X11FLAGS.EXTENSION+= -D__GLX_ALIGN64 @@ -126,26 +126,28 @@ X11FLAGS.EXTENSION+= -D__GLX_ALIGN64
126 ${MACHINE} == "sparc" || \ 126 ${MACHINE} == "sparc" || \
127 ${MACHINE} == "shark" 127 ${MACHINE} == "shark"
128# LOADABLE 128# LOADABLE
129X11FLAGS.LOADABLE= -DXFree86LOADER -DIN_MODULE -DXFree86Module \ 129X11FLAGS.LOADABLE= -DXFree86LOADER -DIN_MODULE -DXFree86Module \
130 -fno-merge-constants 130 -fno-merge-constants
131.endif 131.endif
132  132
133# XXX FIX ME 133# XXX FIX ME
134.if ${MKXORG} != "no" 134.if ${MKXORG} != "no"
135XVENDORNAMESHORT= '"X.Org"' 135XVENDORNAMESHORT= '"X.Org"'
136XVENDORNAME= '"The X.Org Foundation"' 136XVENDORNAME= '"The X.Org Foundation"'
137XORG_RELEASE= '"Release 1.4.2"' 137XORG_RELEASE= '"Release 1.4.2"'
138__XKBDEFRULES__= '"xorg"' 138__XKBDEFRULES__= '"xorg"'
 139XLOCALE.DEFINES= -DXLOCALEDIR=\"${X11LIBDIR}/locale\" \
 140 -DXLOCALELIBDIR=\"${X11LIBDIR}/locale\"
139 141
140# XXX oh yeah, fix me later 142# XXX oh yeah, fix me later
141XORG_VERSION_CURRENT="(((1) * 10000000) + ((4) * 100000) + ((2) * 1000) + 0)" 143XORG_VERSION_CURRENT="(((1) * 10000000) + ((4) * 100000) + ((2) * 1000) + 0)"
142.endif 144.endif
143 145
144# Extract X11VERSION 146# Extract X11VERSION
145PRINTX11VERSION=awk '/^\#define XF86_VERSION_MAJOR/ {major = $$3} \ 147PRINTX11VERSION=awk '/^\#define XF86_VERSION_MAJOR/ {major = $$3} \
146 /^\#define XF86_VERSION_MINOR/ {minor = $$3} \ 148 /^\#define XF86_VERSION_MINOR/ {minor = $$3} \
147 /^\#define XF86_VERSION_PATCH/ {patch = $$3} \ 149 /^\#define XF86_VERSION_PATCH/ {patch = $$3} \
148 /^\#define XF86_VERSION_SNAP/ {snap = $$3} \ 150 /^\#define XF86_VERSION_SNAP/ {snap = $$3} \
149 END { print "((("major") * 10000000) + (("minor") * 100000) + (("patch") * 1000) + "snap")"}' \ 151 END { print "((("major") * 10000000) + (("minor") * 100000) + (("patch") * 1000) + "snap")"}' \
150 ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf86Version.h 152 ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf86Version.h
151 153