[xorg-commit-diffs] xc/programs/proxymngr Imakefile, 1.1.4.3, 1.1.4.4 main.c, 1.1.4.3, 1.1.4.4

[Egbert Eich]

Committed by: eich

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

Modified Files:
      Tag: XORG-CURRENT
	Imakefile main.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/proxymngr/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:38 -0000	1.1.4.4
@@ -5,7 +5,11 @@
 
 XCOMM $XFree86: xc/programs/proxymngr/Imakefile,v 1.13tsi Exp $
 
-         DEFINES = StrcasecmpDefines
+         XORGREL = XOrgReleaseString
+     XORGREL_DEF = -DXORG_RELEASE="\"$(XORGREL)\""
+
+
+         DEFINES = StrcasecmpDefines $(XORGREL_DEF)
 
          DEPLIBS = $(DEPXTOOLLIB) $(DEPXONLYLIB)
  LOCAL_LIBRARIES = $(XTOOLLIB) $(XONLYLIB)

Index: main.c
===================================================================
RCS file: /cvs/xorg/xc/programs/proxymngr/main.c,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/main.c	5 Mar 2004 13:41:17 -0000	1.1.4.3
+++ b/main.c	15 Apr 2004 10:17:38 -0000	1.1.4.4
@@ -62,8 +62,8 @@
 IcePoVersionRec	PMSetupVersions[] = {{PM_MAJOR_VERSION, PM_MINOR_VERSION,
 				      PMSetupProcessMessages}};
 
-char *PM_VENDOR_STRING = "The X.Org Group";
-char *PM_VENDOR_RELEASE = "Release 6.6";
+char *PM_VENDOR_STRING = XVENDORNAME;
+char *PM_VENDOR_RELEASE = XORG_RELEASE;
 
 int verbose = 0;