[xorg-commit-diffs] xc/programs/xmh Imakefile, 1.1, 1.1.4.1 version.h, 1.1, 1.1.4.1

[Egbert Eich]

Committed by: eich

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

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


Index: Imakefile
===================================================================
RCS file: /cvs/xorg/xc/programs/xmh/Imakefile,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- a/Imakefile	14 Nov 2003 16:49:23 -0000	1.1
+++ b/Imakefile	15 Apr 2004 10:17:49 -0000	1.1.4.1
@@ -1,9 +1,12 @@
 XCOMM $XConsortium: Imakefile /main/31 1996/09/28 17:18:46 rws $
 
+         XORGREL = XOrgReleaseString
+     XORGREL_DEF = -DXORG_RELEASE="\"$(XORGREL)\""
+
 #if HasVFork
   VFORK_DEFINES = -DHAS_VFORK
 #endif
-        DEFINES = $(VFORK_DEFINES) XkbClientDefines
+        DEFINES = $(VFORK_DEFINES) XkbClientDefines $(XORGREL_DEF)
         DEPLIBS = XkbClientDepLibs XawClientDepLibs
 LOCAL_LIBRARIES = XkbClientLibs XawClientLibs
 

Index: version.h
===================================================================
RCS file: /cvs/xorg/xc/programs/xmh/version.h,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- a/version.h	14 Nov 2003 16:49:23 -0000	1.1
+++ b/version.h	15 Apr 2004 10:17:49 -0000	1.1.4.1
@@ -29,4 +29,4 @@
 
 */
 
-#define XMH_VERSION "xmh    X Consortium    R6.3"
+#define XMH_VERSION "xmh    "XVENDORNAME", "XORG_RELEASE