[xorg-commit-diffs] xc/config/cf Imake.tmpl, 1.1.4.6.2.1.4.1, 1.1.4.6.2.1.4.2 X11.tmpl, 1.1.4.7.2.7.2.6, 1.1.4.7.2.7.2.7 xorg.tmpl, 1.1.2.3, 1.1.2.4

[Keith Packard]

Committed by: keithp


Index: Imake.tmpl
===================================================================
RCS file: /cvs/xorg/xc/config/cf/Imake.tmpl,v
retrieving revision 1.1.4.6.2.1.4.1
retrieving revision 1.1.4.6.2.1.4.2
diff -u -d -r1.1.4.6.2.1.4.1 -r1.1.4.6.2.1.4.2
--- a/Imake.tmpl	19 Mar 2004 17:08:59 -0000	1.1.4.6.2.1.4.1
+++ b/Imake.tmpl	26 Mar 2004 22:28:08 -0000	1.1.4.6.2.1.4.2
@@ -894,6 +894,9 @@
 #ifndef AppLoadDefs
 #define AppLoadDefs -D__apploaddir__=$(XAPPLOADDIR)
 #endif
+#ifndef AppManDefs
+#define AppManDefs -D__appmansuffix__=$(MANSUFFIX)
+#endif
 #ifndef LibManDefs
 #define LibManDefs -D__libmansuffix__=$(LIBMANSUFFIX)
 #endif
@@ -912,6 +915,18 @@
 #ifndef ProjectManDefs
 #define ProjectManDefs -D__projectroot__=$(PROJECTROOT)
 #endif
+#ifndef XConfigFileManDefs
+#define XConfigFileManDefs -D__xconfigfile__=$(XCONFIGFILE)
+#endif
+#ifndef XConfigDirManDefs
+#define XConfigDirManDefs -D__xconfigdir__=$(XCONFIGDIR)
+#endif
+#ifndef XLogFileManDefs
+#define XLogFileManDefs -D__xlogfile__=$(XLOGFILE)
+#endif
+#ifndef XServerManDefs
+#define XServerManDefs -D__xservername__=$(XSERVERNAME)
+#endif
 
 #ifndef CompressManCmd
 #define CompressManCmd gzip -n
@@ -1818,7 +1833,7 @@
    ADMINMANSUFFIX = AdminManSuffix	/* suffix for admin command man pages */
      MANSRCSUFFIX = ManSrcSuffix	/* suffix for man page source */
      MANNEWSUFFIX = ManNewSuffix	/* suffix for preprocessed man source */
-          MANDEFS = AppLoadDefs FileManDefs LibManDefs MiscManDefs DriverManDefs AdminManDefs ProjectManDefs $(XORGMANDEFS) $(VENDORMANDEFS)
+          MANDEFS = AppLoadDefs AppManDefs FileManDefs LibManDefs MiscManDefs DriverManDefs AdminManDefs ProjectManDefs XConfigFileManDefs XConfigDirManDefs XLogFileManDefs XServerManDefs $(XORGMANDEFS) $(VENDORMANDEFS)
 
    COMPRESSMANCMD = CompressManCmd
 

Index: X11.tmpl
===================================================================
RCS file: /cvs/xorg/xc/config/cf/X11.tmpl,v
retrieving revision 1.1.4.7.2.7.2.6
retrieving revision 1.1.4.7.2.7.2.7
diff -u -d -r1.1.4.7.2.7.2.6 -r1.1.4.7.2.7.2.7
--- a/X11.tmpl	24 Mar 2004 15:58:45 -0000	1.1.4.7.2.7.2.6
+++ b/X11.tmpl	26 Mar 2004 22:28:08 -0000	1.1.4.7.2.7.2.7
@@ -1696,6 +1696,11 @@
 
       XKBDEFRULES = XkbDefaultRulesFile
   XKBDEFRULESDEFS = XkbDefRulesDefines
+  
+     XCONFIGFILE = XConfigFile
+      XCONFIGDIR = XConfigDir
+        XLOGFILE = XLogFile
+     XSERVERNAME = XServerName
 
 #if HasSharedLibraries
 #ifndef DontUseLibPathVar

Index: xorg.tmpl
===================================================================
RCS file: /cvs/xorg/xc/config/cf/Attic/xorg.tmpl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -d -r1.1.2.3 -r1.1.2.4
--- a/xorg.tmpl	24 Mar 2004 15:58:45 -0000	1.1.2.3
+++ b/xorg.tmpl	26 Mar 2004 22:28:08 -0000	1.1.2.4
@@ -1,11 +1,6 @@
 XCOMM $Xorg: xf86.tmpl,v 1.3 2000/08/17 19:41:48 cpqbld Exp $
 XCOMM $XdotOrg$
 
-XCONFIGFILE = XConfigFile
-XCONFIGDIR = XConfigDir
-XLOGFILE = XLogFile
-XSERVERNAME = XServerName
-
 #ifndef ConfigDefines
 # define ConfigDefines -D__XCONFIGFILE__='"$(XCONFIGFILE)"' \
 	-D__XCONFIGDIR__='"$(XCONFIGDIR)"' -D__XLOGFILE__='"$(XLOGFILE)"' \