Commit Graph

7 Commits

Author SHA1 Message Date
lukem 10cfcae8fc Radically overhaul X11 configuration:
*	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.
2004-05-16 10:25:13 +00:00
lukem ac0037bc31 Don't bother with local (custom) version of rstartd.cpp; go back to
using server.cpp from the xsrc/xfree dist directory, because I've
modified the latter to allow a separate BINDIR from LIBDIR.
2004-01-02 16:38:14 +00:00
lukem 4c6d23c4a8 Provide custom version of rstartd.cpp that supports a BINDIR
(for rstartd.real) separate to the LIBDIR (for the configuration)
and install rstartd.real into /usr/X11R6/libexec.
(Installing binaries under /usr/X11R6/lib/X11 (which may be a
symlink to /etc/X11) is Bad.0

Override BINDIR after the .include of <bsd.own.mk>, so that rstartd.real
is installed in the correct location.
2004-01-02 16:32:12 +00:00
lukem a9c9ec0e6e Support MAKEVERBOSE 2003-11-08 13:57:29 +00:00
lukem 9c437ec754 Change `LNFILES' to `BUILDSYMLINKS', to more accurately describe its purpose.
Per discussion with Simon Gerraty.
2003-09-20 06:20:41 +00:00
lukem e214d537fb Rework to include <bsd.x11.mk> before all other <bsd.*.mk> _except_
<bsd.own.mk>, as we now set BINDIR,LIBDIR,MANDIR in <bsd.x11.mk>
rather than using a hierarchy of Makefile.inc files just to include
x11/Makefile.inc to get those variables.
2003-09-13 20:17:57 +00:00
lukem 98ad6e84d6 Imakeicide-II: reach-over makefile infrastructure to build XFree86 4.x
(from /usr/xsrc) using bsd-style Makefiles.
Why?
    -	sane cross building
    -	easy builds from read only source
    -	non-root building
    -	imake is evil
nuff said.
2003-09-11 18:37:05 +00:00