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.
37 lines
902 B
Makefile
37 lines
902 B
Makefile
# $NetBSD: Makefile,v 1.5 2004/05/16 10:25:14 lukem Exp $
|
|
|
|
.include <bsd.own.mk>
|
|
|
|
.include "../../Xserver/Makefile.common"
|
|
|
|
PROG= xinit
|
|
MAN= xinit.1 startx.1
|
|
|
|
XINITDIR= ${X11ETCDIR}/xinit
|
|
|
|
CPPFLAGS+= -DHAS_VFORK ${X11FLAGS.CONNECTION} -DBINDIR=\"${X11BINDIR}\" \
|
|
|
|
.if ${XSERVER_XFREE86} != "no"
|
|
CPPFLAGS+= -DXFREE86
|
|
.endif
|
|
|
|
CPPSCRIPTS= startx xinitrc
|
|
CPPSCRIPTFLAGS_xinitrc= -DXINITDIR=${XINITDIR} -DBINDIR=${X11BINDIR}
|
|
CPPSCRIPTFLAGS_startx= -DXINITDIR=${XINITDIR} -DBINDIR=${X11BINDIR} \
|
|
-DHAS_COOKIE_MAKER \
|
|
-DMK_COOKIE='dd if=/dev/urandom bs=16 count=1 2>/dev/null | hexdump -e \\"%08x\\"'
|
|
|
|
SCRIPTS= startx
|
|
CONFIGFILES= xinitrc
|
|
FILESDIR= ${XINITDIR}
|
|
|
|
LDADD+= -lXmuu -lXt -lSM -lICE -lXext -lX11
|
|
DPADD+= ${LIBXMUU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
|
|
|
|
X11EXTRAMANDEFS=-D__xinitdir__=${XINITDIR}
|
|
|
|
.PATH: ${X11SRCDIR.xc}/programs/${PROG}
|
|
|
|
.include <bsd.x11.mk>
|
|
.include <bsd.prog.mk>
|