[xorg-commit-diffs] xc/config Imakefile,1.1.4.2,1.1.4.3

[Egbert Eich]

Committed by: eich

Update of /cvs/xorg/xc/config
In directory pdx:/home/eich/tstbuild/xc/config

Modified Files:
      Tag: XORG-CURRENT
	Imakefile 
Log Message:
2004-04-15  Egbert Eich  <eich at freedesktop.org>
        Merged changes from RELEASE-1 branch
	


Index: Imakefile
===================================================================
RCS file: /cvs/xorg/xc/config/Imakefile,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/Imakefile	5 Mar 2004 13:38:11 -0000	1.1.4.2
+++ b/Imakefile	15 Apr 2004 10:13:09 -0000	1.1.4.3
@@ -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)