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.
40 lines
1.0 KiB
Makefile
40 lines
1.0 KiB
Makefile
# $NetBSD: Makefile,v 1.6 2004/05/16 10:25:14 lukem Exp $
|
|
|
|
.include <bsd.own.mk>
|
|
|
|
PROG= rstartd.real
|
|
SRCS= auth.c server.c
|
|
RSTARTDBINDIR= ${X11ROOTDIR}/libexec
|
|
RSTARTCONFIGDIR= ${X11ETCDIR}/rstart
|
|
|
|
CPPFLAGS.server.c= -DSERVERNAME=\"rstartd\" \
|
|
-DDEFAULT_CONFIG=\"${RSTARTCONFIGDIR}/config\"
|
|
|
|
MAN= rstart.1 rstartd.1
|
|
|
|
X11EXTRAMANDEFS+= -DRSTARTCONFIGDIR=${RSTARTCONFIGDIR}
|
|
|
|
BUILDSYMLINKS= client.cpp rstart.cpp \
|
|
server.cpp rstartd.cpp
|
|
|
|
CPPSCRIPTS= config rstart rstartd
|
|
CPPSCRIPTFLAGS_config= -DBINDIR=${X11BINDIR} -DLIBDIR=${RSTARTCONFIGDIR} \
|
|
-DPACKAGEname=rstart -DENVPREFIX=RSTART
|
|
CPPSCRIPTFLAGS_rstart= -DRSHCMD=rsh -DSERVERNAME=rstartd
|
|
CPPSCRIPTFLAGS_rstartd= -DLIBDIR=${RSTARTCONFIGDIR} -DSERVERNAME=rstartd \
|
|
-DBINDIR=${RSTARTDBINDIR}
|
|
SCRIPTS= rstart rstartd
|
|
SCRIPTSDIR= ${X11BINDIR}
|
|
CONFIGFILES= config
|
|
FILESDIR= ${RSTARTCONFIGDIR}
|
|
|
|
SUBDIR= commands contexts
|
|
TARGETS+= configinstall
|
|
|
|
.PATH: ${X11SRCDIR.xc}/programs/rstart
|
|
|
|
.include <bsd.x11.mk>
|
|
BINDIR= ${RSTARTDBINDIR}
|
|
.include <bsd.prog.mk>
|
|
.include <bsd.subdir.mk>
|