[xorg-commit-diffs] xc/programs/twm Imakefile, 1.1.4.3, 1.1.4.4 version.c, 1.1, 1.1.4.1

[Egbert Eich]

Committed by: eich

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

Modified Files:
      Tag: XORG-CURRENT
	Imakefile version.c 
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/twm/Imakefile,v
retrieving revision 1.1.4.3
retrieving revision 1.1.4.4
diff -u -d -r1.1.4.3 -r1.1.4.4
--- a/Imakefile	5 Mar 2004 13:41:17 -0000	1.1.4.3
+++ b/Imakefile	15 Apr 2004 10:17:39 -0000	1.1.4.4
@@ -5,6 +5,10 @@
 
 XCOMM $XFree86: xc/programs/twm/Imakefile,v 3.14 2002/10/08 20:54:04 keithp Exp $
 
+
+         XORGREL = XOrgReleaseString
+     XORGREL_DEF = -DXORG_RELEASE="\"$(XORGREL)\""
+
 #if HasMkstemp
   MKTMP_DEFINES = -DHAS_MKSTEMP
 #endif
@@ -12,7 +16,7 @@
         DEPLIBS = $(DEPXMULIB) $(DEPXTOOLLIB) XkbClientDepLibs $(DEPXLIB)
 LOCAL_LIBRARIES = $(XMULIB) $(XTOOLLIB) XkbClientLibs $(XLIB)
        LINTLIBS = $(LINTXMU) $(LINTXTOOLLIB) $(LINTXLIB)
-        DEFINES = $(SIGNAL_DEFINES) $(MKTMP_DEFINES) XkbClientDefines
+        DEFINES = $(SIGNAL_DEFINES) $(MKTMP_DEFINES) XkbClientDefines $(XORGREL_DEF)
 
            SRCS = gram.c lex.c deftwmrc.c add_window.c gc.c list.c twm.c \
 		parse.c menus.c events.c resize.c util.c version.c iconmgr.c \

Index: version.c
===================================================================
RCS file: /cvs/xorg/xc/programs/twm/version.c,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- a/version.c	14 Nov 2003 15:54:53 -0000	1.1
+++ b/version.c	15 Apr 2004 10:17:39 -0000	1.1.4.1
@@ -50,5 +50,5 @@
 /*****************************************************************************/
 
 /* $Xorg: version.c,v 1.4 2001/02/09 02:05:37 xorgcvs Exp $ */
-char *Version = "The Open Group, R6.3";
+char *Version = XVENDORNAME", "XORG_RELEASE;