[xorg-commit-diffs] xc/programs/Xserver/hw/xfree86 Imakefile, 1.1.4.2.6.2, 1.1.4.2.6.2.6.1

[Roland Mainz]

Committed by: gisburn

Update of /cvs/xorg/xc/programs/Xserver/hw/xfree86
In directory pdx:/tmp/cvs-serv7662/xc/programs/Xserver/hw/xfree86

Modified Files:
      Tag: XPRINT
	Imakefile 
Log Message:
Resync to 2004-04-10 XORG-RELEASE-1 branch

Index: Imakefile
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/Imakefile,v
retrieving revision 1.1.4.2.6.2
retrieving revision 1.1.4.2.6.2.6.1
diff -u -d -r1.1.4.2.6.2 -r1.1.4.2.6.2.6.1
--- a/Imakefile	4 Mar 2004 17:47:33 -0000	1.1.4.2.6.2
+++ b/Imakefile	10 Apr 2004 09:04:26 -0000	1.1.4.2.6.2.6.1
@@ -95,17 +95,17 @@
 	  $(XF8_32WIDDIR) getconfig
 
 #if !defined(OS2Architecture) && !defined(cygwinArchitecture)
-XF86CONFIG = XF86Config
+XORGCONFIG = XConfigFile
 XF98CONFIG = XF98Config
 #else
-XF86CONFIG = XF86Conf
+XORGCONFIG = xorg.cfg
 #endif
 
-SAMPLE_CONFIG_FILES = $(XF86CONFIG) $(XF98CONFIG)
+SAMPLE_CONFIG_FILES = $(XORGCONFIG) $(XF98CONFIG)
 
 all:: $(SAMPLE_CONFIG_FILES) xf86Build.h
 
-CHANGELOGFILE = CHANGELOG
+CHANGELOGFILE = $(TOP)/CHANGELOG-$(RELEASE_VERSION)
 
 #if defined(BuildDate)
     BUILD_DATE = BuildDate
@@ -136,9 +136,9 @@
 FRC:
 
 #if defined(i386BsdArchitecture) && !defined(FreeBSDArchitecture)
-MANPAGE=Concat(FileManDir,/XF86Config.0)
+MANPAGE=Concat(FileManDir,/$(XCONFIGFILE).0)
 #else
-MANPAGE=Concat3(FileManDir,/XF86Config.,FileManSuffix)
+MANPAGE=Concat3(FileManDir,/$(XCONFIGFILE).,FileManSuffix)
 #endif
 
 RGBPATH=\"DefaultRGBDatabase\"
@@ -178,7 +178,7 @@
   LINUXMOUSEDEV="XCOMM    Option	\"Device\"	\"/dev/mouse\""
 #endif
 
-CppFileTarget($(XF86CONFIG), XF86Conf.cpp, \
+CppFileTarget($(XORGCONFIG), xorgconf.cpp, \
     -DRGBPATH=$(RGBPATH) -DMISCFONTPATH=$(MISCFONTPATH) \
     -DLOCALFONTPATH=$(LOCALFONTPATH) \
     -DT1FONTPATH=$(T1FONTPATH) \
@@ -209,18 +209,18 @@
     -DMANPAGE=$(MANPAGE) '-DMODULEPATH="$(MODULEDIR)"', \
     $(ICONFIGFILES))
 
-InstallDriverSDKNonExecFile($(XF86CONFIG),$(DRIVERSDKDIR))
+InstallDriverSDKNonExecFile($(XORGCONFIG),$(DRIVERSDKDIR))
 InstallDriverSDKNonExecFile($(XF98CONFIG),$(DRIVERSDKDIR))
 
 EXTRAMANDEFS=-D__logdir__=$(LOGDIRECTORY)
-InstallManPage(XFree86,$(MANDIR))
-InstallGenManPage(XF86Config,$(FILEMANDIR),$(FILEMANSUFFIX))
+InstallManPage(Xorg,$(MANDIR))
+InstallGenManPage(xorg.conf,$(FILEMANDIR),$(FILEMANSUFFIX))
 
-InstallNamedNonExec($(XF86CONFIG),XF86Config.eg,$(LIBDIR))
+InstallNamedNonExec($(XORGCONFIG),XF86Config.eg,$(LIBDIR))
 InstallNamedNonExec($(XF98CONFIG),XF86Config.98,$(LIBDIR))
 InstallNamedNonExec(Options,Options,$(LIBDIR))
 
-InstallDriverSDKNamedNonExec($(XF86CONFIG),XF86Config.eg,$(DRIVERSDKDIR))
+InstallDriverSDKNamedNonExec($(XORGCONFIG),XF86Config.eg,$(DRIVERSDKDIR))
 
 MakeSubdirs($(SUBDIRS))
 DependSubdirs($(SUBDIRS))