[xorg-commit-diffs] xc/config Imakefile,1.1.4.1.6.1,1.1.4.1.6.2

[Egbert Eich]

Committed by: eich

Update of /cvs/xorg/xc/config
In directory pdx:/tmp/cvs-serv13014/config

Modified Files:
      Tag: XORG-RELEASE-1
	Imakefile 
Log Message:
 70. Merging in the TM branch (Egbert Eich).



Index: Imakefile
===================================================================
RCS file: /cvs/xorg/xc/config/Imakefile,v
retrieving revision 1.1.4.1.6.1
retrieving revision 1.1.4.1.6.2
diff -u -d -r1.1.4.1.6.1 -r1.1.4.1.6.2
--- a/Imakefile	4 Mar 2004 17:45:30 -0000	1.1.4.1.6.1
+++ b/Imakefile	2 Apr 2004 21:47:09 -0000	1.1.4.1.6.2
@@ -12,15 +12,20 @@
 #endif
 SUBDIRS = cf $(BOOTSTRAPSUBDIRS) util $(PSWRAPDIR)
 
-#if defined(XFree86VersionString) && defined(ProjectRoot) && \
+#if (defined(XFree86VersionString) || defined(XorgVersionString)) \
+	&& defined(ProjectRoot) && \
 	defined(BuildBindist)
 all:: version
 
 version: cf/version.def
 	RemoveFile(version)
+#if defined (XFree86VersionString)
 	echo XFree86VersionString > version
+#elif defined (XorgVersionString)
+	echo XorgVersionString > version
+#endif
 
-InstallNamedNonExec(version,.XFree86_Version,ProjectRoot)
+InstallNamedNonExec(version,.$(VENDORNAMESHORT)_Version,ProjectRoot)
 
 clean::
 	RemoveFile(version)