? Makefile.in ? aclocal.m4 ? autom4te.cache ? configure ? install-sh ? missing Index: Imake.tmpl =================================================================== RCS file: /cvs/xorg/util/cf/Imake.tmpl,v retrieving revision 1.16 diff -u -r1.16 Imake.tmpl --- Imake.tmpl 8 Nov 2005 06:33:24 -0000 1.16 +++ Imake.tmpl 15 Apr 2006 14:43:59 -0000 @@ -1,7 +1,7 @@ XCOMM ---------------------------------------------------------------------- XCOMM Makefile generated from IMAKE_TEMPLATE and INCLUDE_IMAKEFILE XCOMM $Xorg: Imake.tmpl,v 1.4 2000/08/17 19:41:46 cpqbld Exp $ -XCOMM $XdotOrg: util/cf/Imake.tmpl,v 1.16 2005/11/08 06:33:24 jkj Exp $ +XCOMM $XdotOrg: xc/config/cf/Imake.tmpl,v 1.9 2005/01/24 06:37:31 daniels Exp $ XCOMM XCOMM XCOMM @@ -237,7 +237,7 @@ #endif #ifndef BuildRman -#define BuildRman YES +#define BuildRman NO #endif #ifndef HasGperf Index: X11.tmpl =================================================================== RCS file: /cvs/xorg/util/cf/X11.tmpl,v retrieving revision 1.53 diff -u -r1.53 X11.tmpl --- X11.tmpl 1 Oct 2005 16:45:48 -0000 1.53 +++ X11.tmpl 15 Apr 2006 14:44:01 -0000 @@ -1,6 +1,6 @@ XCOMM ---------------------------------------------------------------------- XCOMM X Window System Build Parameters and Rules -XCOMM $XdotOrg: util/cf/X11.tmpl,v 1.53 2005/10/01 16:45:48 herrb Exp $ +XCOMM $XdotOrg: xc/config/cf/X11.tmpl,v 1.52 2005/09/22 23:54:18 alanc Exp $ XCOMM $Xorg: X11.tmpl,v 1.6 2000/08/17 19:41:46 cpqbld Exp $ XCOMM XCOMM @@ -812,7 +812,7 @@ # define DefaultFSFontPath DefaultFontPath #endif #ifndef DefaultRGBDatabase -#define DefaultRGBDatabase $(LIBDIR)/rgb +#define DefaultRGBDatabase $(SHAREDIR)/rgb #endif #ifndef UseRgbTxt #define UseRgbTxt NO /* default is to compile with dbm */ @@ -1469,6 +1469,13 @@ #ifndef ModuleDir #define ModuleDir $(USRLIBDIR)/modules #endif +#ifndef ShareDir +# ifdef ProjectRoot +# define ShareDir Concat(ProjectRoot,/share/X11) +# else +# define ShareDir /usr/share/X11 +# endif +#endif #ifndef InstSrcDir #define InstSrcDir Concat(ProjectRoot,/src) #endif @@ -1646,7 +1653,8 @@ XBUILDBINDIR = XBuildBinDir INCDIR = $(INCROOT) /* header files */ ADMDIR = AdmDir /* server log files */ - LIBDIR = LibDir /* rgb, XErrorDB, etc. */ + LIBDIR = LibDir /* configs for xdm, xinit, etc. */ + SHAREDIR = ShareDir /* rgb, XErrorDB, etc. */ LIBEXECDIR = LibexecDir MODULEDIR = ModuleDir TOP_X_INCLUDES = TopXInclude Index: configure.ac =================================================================== RCS file: /cvs/xorg/util/cf/configure.ac,v retrieving revision 1.7 diff -u -r1.7 configure.ac --- configure.ac 21 Dec 2005 02:30:07 -0000 1.7 +++ configure.ac 15 Apr 2006 14:44:01 -0000 @@ -16,4 +16,5 @@ AC_OUTPUT([ Makefile + site.def ]) Index: site.def =================================================================== RCS file: site.def diff -N site.def --- site.def 6 May 2004 15:08:25 -0000 1.4 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,148 +0,0 @@ -XCOMM site: $TOG: site.sample /main/r64_final/1 1998/02/05 16:28:49 kaleb $ - -/*************************************************************************** - * * - * SITE-SPECIFIC DEFINITIONS * - * * - * This file contains two halves, one included before the vendor-specific * - * configuration file (.cf file), and one included after the .cf file. * - * The before-half should be protected by #ifdef BeforeVendorCF, and the * - * after-half should be protected by #ifdef AfterVendorCF. * - * * - * The before-half should only set things that the .cf file depends on. * - * For the .cf files shipped in this release, the main variables in this * - * category are HasGcc, HasGcc2, HasCplusplus, OSMajorVersion, * - * OSMinorVersion, and OSTeenyVersion. * - * * - * The after-half should contain all other definitions. For example, * - * place your ProjectRoot definition here. * - * * - * OS Major and Minor version numbers should be changed directly in the * - * .cf file, not overridden in site.def. * - * * - ***************************************************************************/ -XCOMM site: $XFree86: xc/config/cf/site.def,v 3.24 2000/06/25 20:17:29 dawes Exp $ - -/* if you want host-specific customization, this is one way to do it */ -/* -#ifndef SiteIConfigFiles -#define SiteIConfigFiles $(IRULESRC)/host.def -#define LocalConfigFiles host.def -#endif -*/ - - -#ifdef BeforeVendorCF - -/* - * Include this for easy XFree86 customisations - */ -#ifndef SiteIConfigFiles -#define SiteIConfigFiles $(IRULESRC)/xorgsite.def $(IRULESRC)/host.def -#endif - -#include - -#include - -/* On systems where cpp doesn't correctly expand macros in include directives - * the two following macros need to be defined directly (where "X11" is - * really whatever the TopLevelProject macro is defined to be). - */ -# if defined(AIXArchitecture) || defined(SVR4Architecture) || \ - defined(SCOArchitecture) || defined(Win32Architecture) || \ - defined(UXPArchitecture) || defined(SunArchitecture) || \ - defined(DynixPtxArchitecture) || defined(i386IscArchitecture) -# ifndef ProjectRulesFile -# define ProjectRulesFile -# endif -# ifndef ProjectTmplFile -# define ProjectTmplFile -# endif -# endif - -/* -#ifndef HasGcc2 -#define HasGcc2 YES -#endif -*/ - -#endif /* BeforeVendorCF */ - -#ifdef AfterVendorCF - -#ifndef ProjectRoot -#define ProjectRoot /usr/X11R6 -#endif - -/* - * On some platforms, some things may be installed outside of ProjectRoot - * by default. To disable this, uncomment the following line. - * -#define NothingOutsideProjectRoot YES - */ - -/* - * Set EtcX11Directory if you want config file links installed under - * ProjectRoot rather than in /etc/X11. See also HasVarDirectory, - * UseEtcX11 and UseSeparateConfDir. - * -#define EtcX11Directory ProjectRoot/etc - */ - - -/* Only set HasXdmAuth to YES if you have a Wraphelp.c file. */ -/* #define HasXdmAuth YES */ - -/* -#if defined(SunArchitecture) && defined(SparcArchitecture) -#define HasCodeCenter YES -#ifndef SVR4Architecture -#define HasTestCenter YES -#endif -#endif -*/ - -/* -#ifdef __hp9000s800 -#define HasCodeCenter YES -#endif -*/ - -/* -#if defined(SunArchitecture) && defined(SparcArchitecture) && !defined(SVR4Architecture) -#define HasPurify YES -#endif -*/ - -/* -#define HasSentinel YES -*/ - -/* -#undef DefaultUserPath -#define DefaultUserPath /bin:/usr/bin:$(BINDIR):/usr/ucb:/usr/local/bin -*/ - - -/* You do NOT need SetUID if you only run the server under xdm */ -/* You MAY need SetUID if users run the server by hand or under xinit */ -/* Consult your system administrator before making the X server setuid */ -/* -#if defined(SunArchitecture) && OSMajorVersion > 4 -#define InstallXserverSetUID YES -#endif -*/ - -/* You do NOT need SetUID if you only run the server under xdm */ -/* You MAY need SetUID if users run the server by hand or under xinit */ -/* Consult your system administrator before making the X server setuid */ -/* -#if defined(XFree86Version) || defined (XorgVersion) -#define InstallXserverSetUID YES -#endif -*/ - -#include - -#endif /* AfterVendorCF */ Index: site.def.in =================================================================== RCS file: site.def.in diff -N site.def.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ site.def.in 15 Apr 2006 14:44:01 -0000 @@ -0,0 +1,148 @@ +XCOMM site: $TOG: site.sample /main/r64_final/1 1998/02/05 16:28:49 kaleb $ + +/*************************************************************************** + * * + * SITE-SPECIFIC DEFINITIONS * + * * + * This file contains two halves, one included before the vendor-specific * + * configuration file (.cf file), and one included after the .cf file. * + * The before-half should be protected by #ifdef BeforeVendorCF, and the * + * after-half should be protected by #ifdef AfterVendorCF. * + * * + * The before-half should only set things that the .cf file depends on. * + * For the .cf files shipped in this release, the main variables in this * + * category are HasGcc, HasGcc2, HasCplusplus, OSMajorVersion, * + * OSMinorVersion, and OSTeenyVersion. * + * * + * The after-half should contain all other definitions. For example, * + * place your ProjectRoot definition here. * + * * + * OS Major and Minor version numbers should be changed directly in the * + * .cf file, not overridden in site.def. * + * * + ***************************************************************************/ +XCOMM site: $XFree86: xc/config/cf/site.def,v 3.24 2000/06/25 20:17:29 dawes Exp $ + +/* if you want host-specific customization, this is one way to do it */ +/* +#ifndef SiteIConfigFiles +#define SiteIConfigFiles $(IRULESRC)/host.def +#define LocalConfigFiles host.def +#endif +*/ + + +#ifdef BeforeVendorCF + +/* + * Include this for easy XFree86 customisations + */ +#ifndef SiteIConfigFiles +#define SiteIConfigFiles $(IRULESRC)/xorgsite.def $(IRULESRC)/host.def +#endif + +#include + +#include + +/* On systems where cpp doesn't correctly expand macros in include directives + * the two following macros need to be defined directly (where "X11" is + * really whatever the TopLevelProject macro is defined to be). + */ +# if defined(AIXArchitecture) || defined(SVR4Architecture) || \ + defined(SCOArchitecture) || defined(Win32Architecture) || \ + defined(UXPArchitecture) || defined(SunArchitecture) || \ + defined(DynixPtxArchitecture) || defined(i386IscArchitecture) +# ifndef ProjectRulesFile +# define ProjectRulesFile +# endif +# ifndef ProjectTmplFile +# define ProjectTmplFile +# endif +# endif + +/* +#ifndef HasGcc2 +#define HasGcc2 YES +#endif +*/ + +#endif /* BeforeVendorCF */ + +#ifdef AfterVendorCF + +#ifndef ProjectRoot +#define ProjectRoot @prefix@ +#endif + +/* + * On some platforms, some things may be installed outside of ProjectRoot + * by default. To disable this, uncomment the following line. + * +#define NothingOutsideProjectRoot YES + */ + +/* + * Set EtcX11Directory if you want config file links installed under + * ProjectRoot rather than in /etc/X11. See also HasVarDirectory, + * UseEtcX11 and UseSeparateConfDir. + * +#define EtcX11Directory ProjectRoot/etc + */ + + +/* Only set HasXdmAuth to YES if you have a Wraphelp.c file. */ +/* #define HasXdmAuth YES */ + +/* +#if defined(SunArchitecture) && defined(SparcArchitecture) +#define HasCodeCenter YES +#ifndef SVR4Architecture +#define HasTestCenter YES +#endif +#endif +*/ + +/* +#ifdef __hp9000s800 +#define HasCodeCenter YES +#endif +*/ + +/* +#if defined(SunArchitecture) && defined(SparcArchitecture) && !defined(SVR4Architecture) +#define HasPurify YES +#endif +*/ + +/* +#define HasSentinel YES +*/ + +/* +#undef DefaultUserPath +#define DefaultUserPath /bin:/usr/bin:$(BINDIR):/usr/ucb:/usr/local/bin +*/ + + +/* You do NOT need SetUID if you only run the server under xdm */ +/* You MAY need SetUID if users run the server by hand or under xinit */ +/* Consult your system administrator before making the X server setuid */ +/* +#if defined(SunArchitecture) && OSMajorVersion > 4 +#define InstallXserverSetUID YES +#endif +*/ + +/* You do NOT need SetUID if you only run the server under xdm */ +/* You MAY need SetUID if users run the server by hand or under xinit */ +/* Consult your system administrator before making the X server setuid */ +/* +#if defined(XFree86Version) || defined (XorgVersion) +#define InstallXserverSetUID YES +#endif +*/ + +#include + +#endif /* AfterVendorCF */