10cfcae8fc
* End user modifiable configuration has moved from
/usr/X11R6/lib/X11/<someprog>
to
/etc/X11/<someprog>
This is consistent with our own policies as well as other projects.
The files & directories that were moved have _NOT_ been marked
`obsolete', as they contain user configuration and therefore we
don't want the automatic "obsolete file removal" mechanism to
remove them.
* The /etc/font/* and /etc/X11/* configuration files are installed
with 'configinstall' (not 'install'), using CONFIGFILES and
CONFIGSYMLINKS.
This is so that a normal 'make build' in src/x11 will not
trash your configuration.
* A 'distribution' target has been added to src/x11 to perform
'make configinstall' in the appropriate subdirectories.
(Should we consider making 'configinstall' a first-class target?)
* The xdm pixmaps have have been moved to /usr/X11R6/include/X11/pixmaps
where the other pixmaps are.
(I don't consider these pictures end-user configuration).
IMPORTANT NOTE:
* These changes require an up to date xsrc, and 'make cleandir' should
be performed in src/x11 before a build for the changes to fully take
effect.
28 lines
818 B
Makefile
28 lines
818 B
Makefile
# $NetBSD: Makefile.ext,v 1.9 2004/05/16 10:25:14 lukem Exp $
|
|
|
|
.PATH: ${X11SRCDIR.xc}/programs/Xserver/Xext
|
|
|
|
CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/Xext \
|
|
-I${X11SRCDIR.xc}/programs/Xserver/Xext/extmod \
|
|
-I${X11SRCDIR.xc}/programs/Xserver/include \
|
|
-I${XSERVERINCDIR} \
|
|
-I${DESTDIR}${X11INCDIR}/X11 \
|
|
-I${DESTDIR}${X11INCDIR}/X11/extensions \
|
|
-I${X11SRCDIR.xc}/include/fonts \
|
|
-I${X11SRCDIR.xc}/programs/Xserver/mi \
|
|
-I${X11SRCDIR.xc}/programs/Xserver/render \
|
|
-I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common
|
|
|
|
CPPFLAGS+= ${X11FLAGS.EXTENSION}
|
|
|
|
.if ${MACHINE} == "sparc64"
|
|
CPPFLAGS+= -UXF86VIDMODE
|
|
.endif
|
|
|
|
CPPFLAGS.security.c= -DDEFAULTPOLICYFILE=\"${X11ETCDIR}/xserver/SecurityPolicy\"
|
|
CPPFLAGS.xf86bigfont.c= -DHAS_SHM
|
|
|
|
.include <bsd.x11.mk>
|
|
LIBDIR= ${XMODULEDIR}
|
|
.include <bsd.lib.mk>
|