[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[Cluster-devel] [PATCH] clean up usage of FOO_RELEASE_NAME



Hi guys,

just a minor cleanup patch:

lots of subsystems use SUBSYSTEM_RELEASE_NAME=RELEASE as defined in make/defines.mk.

The patch does:

cleanup all the subsystems to use RELEASE_VERSION from defines.mk
cleanup all Makefiles to not define SUBSYSTEM_RELEASE_VERSION.
update configure to generate proper entries in defines.mk

as side effect:

fix rgmanager/src/utils/ to be consistent with RELEASE_VERSION (it used to have
PACKAGE_VERSION)
fix gfs2/fsck/ that was using GFS_RELEASE_NAME instead of GFS2_RELEASE_NAME.

Note those are all cosmetic changes. Nothing was really fixed here if not to
make everything consistent.

Please apply or ACK and I will apply.

Fabio

PS and yes i was really bothered this morning :P

-- 
I'm going to make him an offer he can't refuse.
? gfs-kernel/src/gfs/.main.o.d
? make/defines.mk
Index: configure
===================================================================
RCS file: /cvs/cluster/cluster/configure,v
retrieving revision 1.25
diff -u -r1.25 configure
--- configure	6 Jun 2007 08:42:12 -0000	1.25
+++ configure	21 Aug 2007 06:02:16 -0000
@@ -365,7 +365,8 @@
 
 print OFILE "RELEASE_MAJOR = $release_major\n";
 print OFILE "RELEASE_MINOR = $release_minor\n";
-print OFILE "RELEASE = $release_major.$release_minor\n";
+print OFILE "RELEASE_VERSION = $release_major.$release_minor\n";
+print OFILE "CFLAGS += -DRELEASE_VERSION=\\\"$release_major.$release_minor\\\"\n";
 close OFILE;
 
 print "Completed Makefile configuration\n\n";
Index: ccs/ccs_test/Makefile
===================================================================
RCS file: /cvs/cluster/cluster/ccs/ccs_test/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- ccs/ccs_test/Makefile	1 Jun 2007 09:45:30 -0000	1.7
+++ ccs/ccs_test/Makefile	21 Aug 2007 06:02:16 -0000
@@ -16,7 +16,7 @@
 
 OBJS=	ccs_test.o
 
-CFLAGS += -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -DCCS_RELEASE_NAME=\"${RELEASE}\"
+CFLAGS += -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
 CFLAGS += -I${ccsincdir}
 CFLAGS += -I${incdir}
 
Index: ccs/ccs_test/ccs_test.c
===================================================================
RCS file: /cvs/cluster/cluster/ccs/ccs_test/ccs_test.c,v
retrieving revision 1.4
diff -u -r1.4 ccs_test.c
--- ccs/ccs_test/ccs_test.c	11 Feb 2005 17:38:08 -0000	1.4
+++ ccs/ccs_test/ccs_test.c	21 Aug 2007 06:02:16 -0000
@@ -39,7 +39,7 @@
       exit(EXIT_SUCCESS);
     }
     if(!strcmp(argv[i], "-V")){
-      printf("%s %s (built %s %s)\n", argv[0], CCS_RELEASE_NAME, __DATE__, __TIME__);
+      printf("%s %s (built %s %s)\n", argv[0], RELEASE_VERSION, __DATE__, __TIME__);
       printf("%s\n", REDHAT_COPYRIGHT);
       exit(EXIT_SUCCESS);
     }
Index: ccs/ccs_tool/Makefile
===================================================================
RCS file: /cvs/cluster/cluster/ccs/ccs_tool/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- ccs/ccs_tool/Makefile	1 Jun 2007 09:45:31 -0000	1.12
+++ ccs/ccs_tool/Makefile	21 Aug 2007 06:02:16 -0000
@@ -21,7 +21,6 @@
 	editconf.o
 
 CFLAGS += -Wall -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
-CFLAGS += -DCCS_RELEASE_NAME=\"${RELEASE}\"
 CFLAGS += -I${ccsincdir} -I${cmanincdir} `xml2-config --cflags`
 CFLAGS += -I../include
 CFLAGS += -I${incdir}
Index: ccs/ccs_tool/ccs_tool.c
===================================================================
RCS file: /cvs/cluster/cluster/ccs/ccs_tool/ccs_tool.c,v
retrieving revision 1.6
diff -u -r1.6 ccs_tool.c
--- ccs/ccs_tool/ccs_tool.c	3 May 2007 09:06:39 -0000	1.6
+++ ccs/ccs_tool/ccs_tool.c	21 Aug 2007 06:02:16 -0000
@@ -21,7 +21,7 @@
       exit(EXIT_SUCCESS);
   }
   if (!strcmp(argv[optind], "-V")) {
-      printf("%s %s (built %s %s)\n", argv[0], CCS_RELEASE_NAME,
+      printf("%s %s (built %s %s)\n", argv[0], RELEASE_VERSION,
 	     __DATE__, __TIME__);
       printf("%s\n", REDHAT_COPYRIGHT);
       exit(EXIT_SUCCESS);
Index: ccs/common/log.h
===================================================================
RCS file: /cvs/cluster/cluster/ccs/common/log.h,v
retrieving revision 1.4
diff -u -r1.4 log.h
--- ccs/common/log.h	22 Dec 2004 23:01:28 -0000	1.4
+++ ccs/common/log.h	21 Aug 2007 06:02:16 -0000
@@ -87,10 +87,10 @@
 #define die(ext, fmt, args...) { \
     if(log_is_open){ \
       syslog(LOG_ERR, "In %s, at %d (%s) death by:\n" fmt , __FILE__ , \
-            __LINE__ , CCS_RELEASE_NAME , ## args ); exit(ext); \
+            __LINE__ , RELEASE_VERSION , ## args ); exit(ext); \
     }else { \
       fprintf(stderr, "In %s, at %d (%s) death by:\n" fmt , __FILE__ , \
-            __LINE__ , CCS_RELEASE_NAME , ## args ); exit(ext); \
+            __LINE__ , RELEASE_VERSION , ## args ); exit(ext); \
     } \
 }
 
Index: ccs/daemon/Makefile
===================================================================
RCS file: /cvs/cluster/cluster/ccs/daemon/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- ccs/daemon/Makefile	1 Jun 2007 09:45:31 -0000	1.14
+++ ccs/daemon/Makefile	21 Aug 2007 06:02:16 -0000
@@ -20,7 +20,7 @@
 	misc.o \
 	globals.o
 
-CFLAGS += -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -DCCS_RELEASE_NAME=\"${RELEASE}\"
+CFLAGS += -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
 CFLAGS += -Wall
 CFLAGS += -I${cmanincdir} `xml2-config --cflags`
 CFLAGS += -I. -I../include -I../common
Index: ccs/daemon/ccsd.c
===================================================================
RCS file: /cvs/cluster/cluster/ccs/daemon/ccsd.c,v
retrieving revision 1.27
diff -u -r1.27 ccsd.c
--- ccs/daemon/ccsd.c	20 Oct 2006 14:18:00 -0000	1.27
+++ ccs/daemon/ccsd.c	21 Aug 2007 06:02:17 -0000
@@ -478,7 +478,7 @@
       ttl = atoi(optarg);
       break;
     case 'V':
-      printf("%s %s (built %s %s)\n", argv[0], CCS_RELEASE_NAME, __DATE__, __TIME__);
+      printf("%s %s (built %s %s)\n", argv[0], RELEASE_VERSION, __DATE__, __TIME__);
       printf("%s\n", REDHAT_COPYRIGHT);
       exit(EXIT_SUCCESS);
     case 'X':
@@ -784,7 +784,7 @@
  */
 static void print_start_msg(char *msg){
   /* We want the start message to print every time */
-  log_msg("Starting ccsd %s:\n", CCS_RELEASE_NAME);
+  log_msg("Starting ccsd %s:\n", RELEASE_VERSION);
   log_msg(" Built: "__DATE__" "__TIME__"\n");
   log_msg(" %s\n", REDHAT_COPYRIGHT);
   if(msg){
Index: cman/cman_tool/Makefile
===================================================================
RCS file: /cvs/cluster/cluster/cman/cman_tool/Makefile,v
retrieving revision 1.22
diff -u -r1.22 Makefile
--- cman/cman_tool/Makefile	1 Jun 2007 09:45:31 -0000	1.22
+++ cman/cman_tool/Makefile	21 Aug 2007 06:02:17 -0000
@@ -17,7 +17,6 @@
 OBJS=	main.o \
 	join.o
 
-CFLAGS += -DCMAN_RELEASE_NAME=\"${RELEASE}\"
 CFLAGS += -DSBINDIR=\"${sbindir}\"
 CFLAGS += -I${ccsincdir} -I${cmanincdir}
 CFLAGS += -I${incdir}
Index: cman/cman_tool/main.c
===================================================================
RCS file: /cvs/cluster/cluster/cman/cman_tool/main.c,v
retrieving revision 1.54
diff -u -r1.54 main.c
--- cman/cman_tool/main.c	20 Aug 2007 14:37:26 -0000	1.54
+++ cman/cman_tool/main.c	21 Aug 2007 06:02:18 -0000
@@ -690,7 +690,7 @@
 
 		case 'V':
 			printf("cman_tool %s (built %s %s)\n",
-				CMAN_RELEASE_NAME, __DATE__, __TIME__);
+				RELEASE_VERSION, __DATE__, __TIME__);
 			printf("%s\n", REDHAT_COPYRIGHT);
 			exit(EXIT_SUCCESS);
 			break;
Index: cman/daemon/Makefile
===================================================================
RCS file: /cvs/cluster/cluster/cman/daemon/Makefile,v
retrieving revision 1.53
diff -u -r1.53 Makefile
--- cman/daemon/Makefile	13 Jun 2007 08:28:45 -0000	1.53
+++ cman/daemon/Makefile	21 Aug 2007 06:02:18 -0000
@@ -12,7 +12,7 @@
 
 include ../../make/defines.mk
 
-CFLAGS += -DCMAN_RELEASE_NAME=\"${RELEASE}\" -DOPENAIS_EXTERNAL_SERVICE
+CFLAGS += -DOPENAIS_EXTERNAL_SERVICE
 CFLAGS += -fPIC
 CFLAGS += -I${ccsincdir} -I${openaisincdir}
 CFLAGS += -I${incdir}
Index: cman/daemon/daemon.c
===================================================================
RCS file: /cvs/cluster/cluster/cman/daemon/daemon.c,v
retrieving revision 1.35
diff -u -r1.35 daemon.c
--- cman/daemon/daemon.c	19 Jun 2007 12:32:19 -0000	1.35
+++ cman/daemon/daemon.c	21 Aug 2007 06:02:18 -0000
@@ -482,7 +482,7 @@
 	barrier_init();
 
 	log_msg(LOG_INFO, "CMAN %s (built %s %s) started\n",
-		CMAN_RELEASE_NAME, __DATE__, __TIME__);
+		RELEASE_VERSION, __DATE__, __TIME__);
 
 	fd = open_local_sock(CLIENT_SOCKNAME, sizeof(CLIENT_SOCKNAME), 0660, ais_poll_handle, CON_CLIENT);
 	if (fd < 0)
Index: fence/agents/apc/Makefile
===================================================================
RCS file: /cvs/cluster/cluster/fence/agents/apc/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- fence/agents/apc/Makefile	2 May 2007 12:39:32 -0000	1.5
+++ fence/agents/apc/Makefile	21 Aug 2007 06:02:18 -0000
@@ -20,7 +20,7 @@
 $(TARGET): $(TARGET).py
 	: > $(TARGET)
 	awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(TARGET).py >> $(TARGET)
-	echo "FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(TARGET)
+	echo "RELEASE_VERSION=\"${RELEASE_VERSION}\";" >> $(TARGET)
 	${DEF2VAR} ${BUILDDIR}/config/copyright.cf sh REDHAT_COPYRIGHT >> $(TARGET)
 	echo "BUILD_DATE=\"(built `date`)\";" >> $(TARGET)
 	awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(TARGET).py >> $(TARGET)
Index: fence/agents/apc/fence_apc.pl
===================================================================
RCS file: /cvs/cluster/cluster/fence/agents/apc/fence_apc.pl,v
retrieving revision 1.10
diff -u -r1.10 fence_apc.pl
--- fence/agents/apc/fence_apc.pl	16 Aug 2006 18:58:40 -0000	1.10
+++ fence/agents/apc/fence_apc.pl	21 Aug 2007 06:02:18 -0000
@@ -47,7 +47,7 @@
 # "#END_VERSION_GENERATION"  It is generated by the Makefile
 
 #BEGIN_VERSION_GENERATION
-$FENCE_RELEASE_NAME="";
+$RELEASE_VERSION="";
 $REDHAT_COPYRIGHT="";
 $BUILD_DATE="";
 #END_VERSION_GENERATION
@@ -99,7 +99,7 @@
 
 sub version
 {
-	print "$pname $FENCE_RELEASE_NAME $BUILD_DATE\n";
+	print "$pname $RELEASE_VERSION $BUILD_DATE\n";
 	print "$REDHAT_COPYRIGHT\n" if ( $REDHAT_COPYRIGHT );
 	exit 0;
 }
Index: fence/agents/apc/fence_apc.py
===================================================================
RCS file: /cvs/cluster/cluster/fence/agents/apc/fence_apc.py,v
retrieving revision 1.5
diff -u -r1.5 fence_apc.py
--- fence/agents/apc/fence_apc.py	12 Jul 2007 03:45:44 -0000	1.5
+++ fence/agents/apc/fence_apc.py	21 Aug 2007 06:02:19 -0000
@@ -25,7 +25,7 @@
 # "#END_VERSION_GENERATION"  It is generated by the Makefile
 
 #BEGIN_VERSION_GENERATION
-FENCE_RELEASE_NAME="New APC Agent - test release"
+RELEASE_VERSION="New APC Agent - test release"
 REDHAT_COPYRIGHT=""
 BUILD_DATE="September 21, 2006"
 #END_VERSION_GENERATION
@@ -101,7 +101,7 @@
   sys.exit (0)
 
 def version():
-  print "fence_apc %s  %s\n" % (FENCE_RELEASE_NAME, BUILD_DATE)
+  print "fence_apc %s  %s\n" % (RELEASE_VERSION, BUILD_DATE)
   print "%s\n" % REDHAT_COPYRIGHT
   sys.exit(0)
 
Index: fence/agents/apc/fence_apc_snmp.py
===================================================================
RCS file: /cvs/cluster/cluster/fence/agents/apc/fence_apc_snmp.py,v
retrieving revision 1.3
diff -u -r1.3 fence_apc_snmp.py
--- fence/agents/apc/fence_apc_snmp.py	14 Feb 2007 09:37:10 -0000	1.3
+++ fence/agents/apc/fence_apc_snmp.py	21 Aug 2007 06:02:19 -0000
@@ -28,7 +28,7 @@
 from glob import glob
 
 #BEGIN_VERSION_GENERATION
-FENCE_RELEASE_NAME=""
+RELEASE_VERSION=""
 REDHAT_COPYRIGHT=""
 BUILD_DATE=""
 #END_VERSION_GENERATION
@@ -83,7 +83,7 @@
       if o == "-v":
         verbose = True
       if o == "-V":
-        print "%s\n" % FENCE_RELEASE_NAME
+        print "%s\n" % RELEASE_VERSION
         print "%s\n" % REDHAT_COPYRIGHT
         print "%s\n" % BUILD_DATE
         sys.exit(0)
Index: fence/agents/baytech/Makefile
===================================================================
RCS file: /cvs/cluster/cluster/fence/agents/baytech/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- fence/agents/baytech/Makefile	2 May 2007 12:39:32 -0000	1.3
+++ fence/agents/baytech/Makefile	21 Aug 2007 06:02:19 -0000
@@ -20,7 +20,7 @@
 $(TARGET): $(TARGET).pl
 	: > $(TARGET)
 	awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(TARGET).pl >> $(TARGET)
-	echo "\$$FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(TARGET)
+	echo "\$$RELEASE_VERSION=\"${RELEASE_VERSION}\";" >> $(TARGET)
 	${DEF2VAR} ${BUILDDIR}/config/copyright.cf perl REDHAT_COPYRIGHT >> $(TARGET)
 	echo "\$$BUILD_DATE=\"(built `date`)\";" >> $(TARGET)
 	awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(TARGET).pl >> $(TARGET)
Index: fence/agents/baytech/fence_baytech.pl
===================================================================
RCS file: /cvs/cluster/cluster/fence/agents/baytech/fence_baytech.pl,v
retrieving revision 1.3
diff -u -r1.3 fence_baytech.pl
--- fence/agents/baytech/fence_baytech.pl	12 Feb 2007 20:17:05 -0000	1.3
+++ fence/agents/baytech/fence_baytech.pl	21 Aug 2007 06:02:20 -0000
@@ -31,7 +31,7 @@
 # "#END_VERSION_GENERATION"  It is generated by the Makefile
 
 #BEGIN_VERSION_GENERATION
-$FENCE_RELEASE_NAME="";
+$RELEASE_VERSION="";
 $REDHAT_COPYRIGHT="";
 $BUILD_DATE="";
 #END_VERSION_GENERATION
@@ -94,7 +94,7 @@
 
 sub version
 {
-  print "$pname $FENCE_RELEASE_NAME $BUILD_DATE\n";
+  print "$pname $RELEASE_VERSION $BUILD_DATE\n";
   print "$REDHAT_COPYRIGHT\n" if ( $REDHAT_COPYRIGHT );
 
   exit 0;
Index: fence/agents/bladecenter/Makefile
===================================================================
RCS file: /cvs/cluster/cluster/fence/agents/bladecenter/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- fence/agents/bladecenter/Makefile	2 May 2007 12:39:32 -0000	1.5
+++ fence/agents/bladecenter/Makefile	21 Aug 2007 06:02:20 -0000
@@ -20,7 +20,7 @@
 $(TARGET): $(TARGET).pl
 	: > $(TARGET)
 	awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(TARGET).pl >> $(TARGET)
-	echo "\$$FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(TARGET)
+	echo "\$$RELEASE_VERSION=\"${RELEASE_VERSION}\";" >> $(TARGET)
 	${DEF2VAR} ${BUILDDIR}/config/copyright.cf perl REDHAT_COPYRIGHT >> $(TARGET)
 	echo "\$$BUILD_DATE=\"(built `date`)\";" >> $(TARGET)
 	awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(TARGET).pl >> $(TARGET)
Index: fence/agents/bladecenter/fence_bladecenter.pl
===================================================================
RCS file: /cvs/cluster/cluster/fence/agents/bladecenter/fence_bladecenter.pl,v
retrieving revision 1.3
diff -u -r1.3 fence_bladecenter.pl
--- fence/agents/bladecenter/fence_bladecenter.pl	12 Feb 2007 20:17:05 -0000	1.3
+++ fence/agents/bladecenter/fence_bladecenter.pl	21 Aug 2007 06:02:20 -0000
@@ -34,7 +34,7 @@
 # "#END_VERSION_GENERATION"  It is generated by the Makefile
 
 #BEGIN_VERSION_GENERATION
-$FENCE_RELEASE_NAME="";
+$RELEASE_VERSION="";
 $REDHAT_COPYRIGHT="";
 $BUILD_DATE="";
 #END_VERSION_GENERATION
@@ -78,7 +78,7 @@
 
 sub version
 {
-	print "$pname $FENCE_RELEASE_NAME $BUILD_DATE\n";
+	print "$pname $RELEASE_VERSION $BUILD_DATE\n";
 	print "$REDHAT_COPYRIGHT\n" if ( $REDHAT_COPYRIGHT );
 
 	exit 0;
Index: fence/agents/brocade/Makefile
===================================================================
RCS file: /cvs/cluster/cluster/fence/agents/brocade/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- fence/agents/brocade/Makefile	2 May 2007 12:39:32 -0000	1.4
+++ fence/agents/brocade/Makefile	21 Aug 2007 06:02:20 -0000
@@ -20,7 +20,7 @@
 $(TARGET): $(TARGET).pl
 	: > $(TARGET)
 	awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(TARGET).pl >> $(TARGET)
-	echo "\$$FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(TARGET)
+	echo "\$$RELEASE_VERSION=\"${RELEASE_VERSION}\";" >> $(TARGET)
 	${DEF2VAR} ${BUILDDIR}/config/copyright.cf perl REDHAT_COPYRIGHT >> $(TARGET)
 	echo "\$$BUILD_DATE=\"(built `date`)\";" >> $(TARGET)
 	awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(TARGET).pl >> $(TARGET)
Index: fence/agents/brocade/fence_brocade.pl
===================================================================
RCS file: /cvs/cluster/cluster/fence/agents/brocade/fence_brocade.pl,v
retrieving revision 1.4
diff -u -r1.4 fence_brocade.pl
--- fence/agents/brocade/fence_brocade.pl	12 Feb 2007 20:17:06 -0000	1.4
+++ fence/agents/brocade/fence_brocade.pl	21 Aug 2007 06:02:20 -0000
@@ -27,7 +27,7 @@
 # "#END_VERSION_GENERATION"  It is generated by the Makefile
 
 #BEGIN_VERSION_GENERATION
-$FENCE_RELEASE_NAME="";
+$RELEASE_VERSION="";
 $REDHAT_COPYRIGHT="";
 $BUILD_DATE="";
 #END_VERSION_GENERATION
@@ -71,7 +71,7 @@
 
 sub version
 {
-  print "$pname $FENCE_RELEASE_NAME $BUILD_DATE\n";
+  print "$pname $RELEASE_VERSION $BUILD_DATE\n";
   print "$REDHAT_COPYRIGHT\n" if ( $REDHAT_COPYRIGHT );
 
   exit 0;
Index: fence/agents/bullpap/Makefile
===================================================================
RCS file: /cvs/cluster/cluster/fence/agents/bullpap/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- fence/agents/bullpap/Makefile	2 May 2007 12:39:32 -0000	1.5
+++ fence/agents/bullpap/Makefile	21 Aug 2007 06:02:20 -0000
@@ -20,7 +20,7 @@
 $(TARGET): $(TARGET).pl
 	: > $(TARGET)
 	awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(TARGET).pl >> $(TARGET)
-	echo "\$$FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(TARGET)
+	echo "\$$RELEASE_VERSION=\"${RELEASE_VERSION}\";" >> $(TARGET)
 	${DEF2VAR} ${BUILDDIR}/config/copyright.cf perl REDHAT_COPYRIGHT >> $(TARGET)
 	echo "\$$BUILD_DATE=\"(built `date`)\";" >> $(TARGET)
 	awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(TARGET).pl >> $(TARGET)
Index: fence/agents/bullpap/fence_bullpap.pl
===================================================================
RCS file: /cvs/cluster/cluster/fence/agents/bullpap/fence_bullpap.pl,v
retrieving revision 1.7
diff -u -r1.7 fence_bullpap.pl
--- fence/agents/bullpap/fence_bullpap.pl	12 Feb 2007 20:17:06 -0000	1.7
+++ fence/agents/bullpap/fence_bullpap.pl	21 Aug 2007 06:02:20 -0000
@@ -30,7 +30,7 @@
 # "#END_VERSION_GENERATION"  It is generated by the Makefile
 
 #BEGIN_VERSION_GENERATION
-$FENCE_RELEASE_NAME="";
+$RELEASE_VERSION="";
 $REDHAT_COPYRIGHT="";
 $BUILD_DATE="";
 #END_VERSION_GENERATION
@@ -83,7 +83,7 @@
 
 sub version
 {
-	print "$pname $FENCE_RELEASE_NAME $BUILD_DATE\n";
+	print "$pname $RELEASE_VERSION $BUILD_DATE\n";
 	print "$REDHAT_COPYRIGHT\n" if ( $REDHAT_COPYRIGHT );
 
 	exit 0;
Index: fence/agents/cpint/Makefile
===================================================================
RCS file: /cvs/cluster/cluster/fence/agents/cpint/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- fence/agents/cpint/Makefile	2 May 2007 12:39:32 -0000	1.3
+++ fence/agents/cpint/Makefile	21 Aug 2007 06:02:20 -0000
@@ -20,7 +20,7 @@
 $(TARGET): $(TARGET).pl
 	: > $(TARGET)
 	awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(TARGET).pl >> $(TARGET)
-	echo "\$$FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(TARGET)
+	echo "\$$RELEASE_VERSION=\"${RELEASE_VERSION}\";" >> $(TARGET)
 	${DEF2VAR} ${BUILDDIR}/config/copyright.cf perl REDHAT_COPYRIGHT >> $(TARGET)
 	echo "\$$BUILD_DATE=\"(built `date`)\";" >> $(TARGET)
 	awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(TARGET).pl >> $(TARGET)
Index: fence/agents/cpint/fence_cpint.pl
===================================================================
RCS file: /cvs/cluster/cluster/fence/agents/cpint/fence_cpint.pl,v
retrieving revision 1.2
diff -u -r1.2 fence_cpint.pl
--- fence/agents/cpint/fence_cpint.pl	12 Feb 2007 20:17:06 -0000	1.2
+++ fence/agents/cpint/fence_cpint.pl	21 Aug 2007 06:02:20 -0000
@@ -26,7 +26,7 @@
 # "#END_VERSION_GENERATION"  It is generated by the Makefile
 
 #BEGIN_VERSION_GENERATION
-$FENCE_RELEASE_NAME="";
+$RELEASE_VERSION="";
 $REDHAT_COPYRIGHT="";
 $BUILD_DATE="";
 #END_VERSION_GENERATION
@@ -64,7 +64,7 @@
 
 sub version
 {
-  print "$pname $FENCE_RELEASE_NAME $BUILD_DATE\n";
+  print "$pname $RELEASE_VERSION $BUILD_DATE\n";
   print "$REDHAT_COPYRIGHT\n" if ( $REDHAT_COPYRIGHT );
 
   exit 0;
Index: fence/agents/drac/Makefile
===================================================================
RCS file: /cvs/cluster/cluster/fence/agents/drac/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- fence/agents/drac/Makefile	2 May 2007 12:39:32 -0000	1.4
+++ fence/agents/drac/Makefile	21 Aug 2007 06:02:20 -0000
@@ -20,7 +20,7 @@
 $(TARGET): $(TARGET).pl
 	: > $(TARGET)
 	awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(TARGET).pl >> $(TARGET)
-	echo "\$$FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(TARGET)
+	echo "\$$RELEASE_VERSION=\"${RELEASE_VERSION}\";" >> $(TARGET)
 	${DEF2VAR} ${BUILDDIR}/config/copyright.cf perl REDHAT_COPYRIGHT >> $(TARGET)
 	echo "\$$BUILD_DATE=\"(built `date`)\";" >> $(TARGET)
 	awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(TARGET).pl >> $(TARGET)
Index: fence/agents/drac/fence_drac.pl
===================================================================
RCS file: /cvs/cluster/cluster/fence/agents/drac/fence_drac.pl,v
retrieving revision 1.10
diff -u -r1.10 fence_drac.pl
--- fence/agents/drac/fence_drac.pl	12 Feb 2007 20:17:06 -0000	1.10
+++ fence/agents/drac/fence_drac.pl	21 Aug 2007 06:02:20 -0000
@@ -58,7 +58,7 @@
 # "#END_VERSION_GENERATION"  It is generated by the Makefile
 
 #BEGIN_VERSION_GENERATION
-$FENCE_RELEASE_NAME="";
+$RELEASE_VERSION="";
 $REDHAT_COPYRIGHT="";
 $BUILD_DATE="";
 #END_VERSION_GENERATION
@@ -126,7 +126,7 @@
 
 sub version
 {
-	print "$pname $FENCE_RELEASE_NAME $BUILD_DATE\n";
+	print "$pname $RELEASE_VERSION $BUILD_DATE\n";
 	print "$REDHAT_COPYRIGHT\n" if ( $REDHAT_COPYRIGHT );
 	exit 0;
 }
Index: fence/agents/egenera/Makefile
===================================================================
RCS file: /cvs/cluster/cluster/fence/agents/egenera/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- fence/agents/egenera/Makefile	2 May 2007 12:39:32 -0000	1.4
+++ fence/agents/egenera/Makefile	21 Aug 2007 06:02:20 -0000
@@ -20,7 +20,7 @@
 $(TARGET): $(TARGET).pl
 	: > $(TARGET)
 	awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(TARGET).pl >> $(TARGET)
-	echo "\$$FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(TARGET)
+	echo "\$$RELEASE_VERSION=\"${RELEASE_VERSION}\";" >> $(TARGET)
 	${DEF2VAR} ${BUILDDIR}/config/copyright.cf perl REDHAT_COPYRIGHT >> $(TARGET)
 	echo "\$$BUILD_DATE=\"(built `date`)\";" >> $(TARGET)
 	awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(TARGET).pl >> $(TARGET)
Index: fence/agents/egenera/fence_egenera.pl
===================================================================
RCS file: /cvs/cluster/cluster/fence/agents/egenera/fence_egenera.pl,v
retrieving revision 1.3
diff -u -r1.3 fence_egenera.pl
--- fence/agents/egenera/fence_egenera.pl	12 Feb 2007 20:17:06 -0000	1.3
+++ fence/agents/egenera/fence_egenera.pl	21 Aug 2007 06:02:20 -0000
@@ -20,7 +20,7 @@
 # "#END_VERSION_GENERATION"  It is generated by the Makefile
 
 #BEGIN_VERSION_GENERATION
-$FENCE_RELEASE_NAME="";
+$RELEASE_VERSION="";
 $REDHAT_COPYRIGHT="";
 $BUILD_DATE="";
 #END_VERSION_GENERATION
@@ -69,7 +69,7 @@
 
 sub version
 {
-	print "$pname $FENCE_RELEASE_NAME $BUILD_DATE\n";
+	print "$pname $RELEASE_VERSION $BUILD_DATE\n";
 	print "$REDHAT_COPYRIGHT\n" if ( $REDHAT_COPYRIGHT );
 
 	exit 0;
Index: fence/agents/ibmblade/Makefile
===================================================================
RCS file: /cvs/cluster/cluster/fence/agents/ibmblade/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- fence/agents/ibmblade/Makefile	2 May 2007 12:39:33 -0000	1.3
+++ fence/agents/ibmblade/Makefile	21 Aug 2007 06:02:20 -0000
@@ -20,7 +20,7 @@
 $(TARGET): $(TARGET).pl
 	: > $(TARGET)
 	awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(TARGET).pl >> $(TARGET)
-	echo "\$$FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(TARGET)
+	echo "\$$RELEASE_VERSION=\"${RELEASE_VERSION}\";" >> $(TARGET)
 	${DEF2VAR} ${BUILDDIR}/config/copyright.cf perl REDHAT_COPYRIGHT >> $(TARGET)
 	echo "\$$BUILD_DATE=\"(built `date`)\";" >> $(TARGET)
 	awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(TARGET).pl >> $(TARGET)
Index: fence/agents/ibmblade/fence_ibmblade.pl
===================================================================
RCS file: /cvs/cluster/cluster/fence/agents/ibmblade/fence_ibmblade.pl,v
retrieving revision 1.3
diff -u -r1.3 fence_ibmblade.pl
--- fence/agents/ibmblade/fence_ibmblade.pl	12 Feb 2007 20:17:06 -0000	1.3
+++ fence/agents/ibmblade/fence_ibmblade.pl	21 Aug 2007 06:02:20 -0000
@@ -34,7 +34,7 @@
 # "#END_VERSION_GENERATION"  It is generated by the Makefile
 
 #BEGIN_VERSION_GENERATION
-$FENCE_RELEASE_NAME="";
+$RELEASE_VERSION="";
 $REDHAT_COPYRIGHT="";
 $BUILD_DATE="";
 #END_VERSION_GENERATION
@@ -77,7 +77,7 @@
 
 sub version
 {
-  print "$pname $FENCE_RELEASE_NAME $BUILD_DATE\n";
+  print "$pname $RELEASE_VERSION $BUILD_DATE\n";
   print "$REDHAT_COPYRIGHT\n" if ( $REDHAT_COPYRIGHT );
 
   exit 0;
@@ -179,7 +179,7 @@
 	-timeout    => $snmp_timeout); 
 
 if (!defined ($snmpsess)) { 
-	printf("$FENCE_RELEASE_NAME ERROR: %s.\n", $error);
+	printf("$RELEASE_VERSION ERROR: %s.\n", $error);
 	exit 1; 
 };
 
@@ -190,25 +190,25 @@
 	-varbindlist => [$oid]
 );
 if (!defined($result)) {
-	printf("$FENCE_RELEASE_NAME ERROR: %s.\n", $snmpsess->error);
+	printf("$RELEASE_VERSION ERROR: %s.\n", $snmpsess->error);
 	$snmpsess->close;
 	exit 1;
 }
 
 if (defined ($opt_t)) { 
-	printf ("$FENCE_RELEASE_NAME STATE: Port %d on %s returned %d\n", $opt_n, $opt_a, $result->{$oid}); 
+	printf ("$RELEASE_VERSION STATE: Port %d on %s returned %d\n", $opt_n, $opt_a, $result->{$oid}); 
 	exit 1; 
 };
 
 if ($opt_o =~ /^(reboot|off)$/i) { 
 	if ($result->{$oid} == "0") { 
-		printf ("$FENCE_RELEASE_NAME WARNING: Port %d on %s already down.\n", $opt_n, $opt_a); 
+		printf ("$RELEASE_VERSION WARNING: Port %d on %s already down.\n", $opt_n, $opt_a); 
 		$snmpsess->close; 
 		exit 0; 
 	}; 
 } else { 
 	if ($result->{$oid} == "1") { 
-		printf ("$FENCE_RELEASE_NAME WARNING: Port %d on %s already up.\n", $opt_n, $opt_a); 
+		printf ("$RELEASE_VERSION WARNING: Port %d on %s already up.\n", $opt_n, $opt_a); 
 		$snmpsess->close; 
 		exit 0; 
 	};
@@ -250,20 +250,20 @@
 
 if (!defined($result)) {
 	# this is a real error
-	printf("$FENCE_RELEASE_NAME ERROR: %s.\n", $snmpsess->error);
+	printf("$RELEASE_VERSION ERROR: %s.\n", $snmpsess->error);
 	$snmpsess->close;
 	exit 1;
 }; 
 
 if ($opt_o =~ /^(off)$/i) { 
 	if ($result->{$oid} == "1") { 
-		printf ("$FENCE_RELEASE_NAME ERROR: Port %d on %s still up.\n", $opt_n, $opt_a); 
+		printf ("$RELEASE_VERSION ERROR: Port %d on %s still up.\n", $opt_n, $opt_a); 
 		$snmpsess->close; 
 		exit 1; 
 	}; 
 } else { 
 	if ($result->{$oid} == "0") { 
-		printf ("$FENCE_RELEASE_NAME ERROR: Port %d on %s still down.\n", $opt_n, $opt_a); 
+		printf ("$RELEASE_VERSION ERROR: Port %d on %s still down.\n", $opt_n, $opt_a); 
 		$snmpsess->close; 
 		exit 1; 
 	};
@@ -272,6 +272,6 @@
 # everything's a ok :) 
 $snmpsess->close; 
 
-printf ("$FENCE_RELEASE_NAME SUCCESS: Port %d on %s changed state to %s\n", $opt_n, $opt_a, $opt_o) unless defined $opt_q;
+printf ("$RELEASE_VERSION SUCCESS: Port %d on %s changed state to %s\n", $opt_n, $opt_a, $opt_o) unless defined $opt_q;
 exit 0; 
 
Index: fence/agents/ilo/Makefile
===================================================================
RCS file: /cvs/cluster/cluster/fence/agents/ilo/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- fence/agents/ilo/Makefile	2 May 2007 12:39:33 -0000	1.4
+++ fence/agents/ilo/Makefile	21 Aug 2007 06:02:20 -0000
@@ -20,7 +20,7 @@
 $(TARGET): $(TARGET).pl
 	: > $(TARGET)
 	awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(TARGET).pl >> $(TARGET)
-	echo "\$$FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(TARGET)
+	echo "\$$RELEASE_VERSION=\"${RELEASE_VERSION}\";" >> $(TARGET)
 	${DEF2VAR} ${BUILDDIR}/config/copyright.cf perl REDHAT_COPYRIGHT >> $(TARGET)
 	echo "\$$BUILD_DATE=\"(built `date`)\";" >> $(TARGET)
 	awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(TARGET).pl >> $(TARGET)
Index: fence/agents/ilo/fence_ilo.pl
===================================================================
RCS file: /cvs/cluster/cluster/fence/agents/ilo/fence_ilo.pl,v
retrieving revision 1.9
diff -u -r1.9 fence_ilo.pl
--- fence/agents/ilo/fence_ilo.pl	25 Jun 2007 21:47:09 -0000	1.9
+++ fence/agents/ilo/fence_ilo.pl	21 Aug 2007 06:02:21 -0000
@@ -27,7 +27,7 @@
 # "#END_VERSION_GENERATION"  It is generated by the Makefile
 
 #BEGIN_VERSION_GENERATION
-$FENCE_RELEASE_NAME="";
+$RELEASE_VERSION="";
 $REDHAT_COPYRIGHT="";
 $BUILD_DATE="";
 #END_VERSION_GENERATION
@@ -78,7 +78,7 @@
 
 sub version
 {
-	print "$pname $FENCE_RELEASE_NAME $BUILD_DATE\n";
+	print "$pname $RELEASE_VERSION $BUILD_DATE\n";
 	print "$REDHAT_COPYRIGHT\n" if ( $REDHAT_COPYRIGHT );
 	exit 0;
 }
Index: fence/agents/ipmilan/Makefile
===================================================================
RCS file: /cvs/cluster/cluster/fence/agents/ipmilan/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- fence/agents/ipmilan/Makefile	1 Jun 2007 09:45:32 -0000	1.6
+++ fence/agents/ipmilan/Makefile	21 Aug 2007 06:02:21 -0000
@@ -18,7 +18,7 @@
 OBJS=	expect.o \
 	ipmilan.o
 
-CFLAGS += -DFENCE_RELEASE_NAME=\"${RELEASE}\" -DFENCE
+CFLAGS += -DFENCE
 CFLAGS += -I${incdir}
 
 all: ${TARGET}
Index: fence/agents/ipmilan/ipmilan.c
===================================================================
RCS file: /cvs/cluster/cluster/fence/agents/ipmilan/ipmilan.c,v
retrieving revision 1.12
diff -u -r1.12 ipmilan.c
--- fence/agents/ipmilan/ipmilan.c	26 Jun 2007 19:52:52 -0000	1.12
+++ fence/agents/ipmilan/ipmilan.c	21 Aug 2007 06:02:21 -0000
@@ -59,7 +59,7 @@
 #include <copyright.cf>
 #else
 #define REDHAT_COPYRIGHT "Copyright (C) 2005 Red Hat, Inc.\n"
-#define FENCE_RELEASE_NAME "TEST ONLY; Not for distribution\n"
+#define RELEASE_VERSION "TEST ONLY; Not for distribution\n"
 
 #endif
 #endif
@@ -1001,7 +1001,7 @@
 				break;
 			case 'V':
         			printf("%s %s (built %s %s)\n", pname,
-				       FENCE_RELEASE_NAME,
+				       RELEASE_VERSION,
                				__DATE__, __TIME__);
         			printf("%s\n",
 				       REDHAT_COPYRIGHT);
Index: fence/agents/mcdata/Makefile
===================================================================
RCS file: /cvs/cluster/cluster/fence/agents/mcdata/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- fence/agents/mcdata/Makefile	2 May 2007 12:39:33 -0000	1.4
+++ fence/agents/mcdata/Makefile	21 Aug 2007 06:02:21 -0000
@@ -20,7 +20,7 @@
 $(TARGET): $(TARGET).pl
 	: > $(TARGET)
 	awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(TARGET).pl >> $(TARGET)
-	echo "\$$FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(TARGET)
+	echo "\$$RELEASE_VERSION=\"${RELEASE_VERSION}\";" >> $(TARGET)
 	${DEF2VAR} ${BUILDDIR}/config/copyright.cf perl REDHAT_COPYRIGHT >> $(TARGET)
 	echo "\$$BUILD_DATE=\"(built `date`)\";" >> $(TARGET)
 	awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(TARGET).pl >> $(TARGET)
Index: fence/agents/mcdata/fence_mcdata.pl
===================================================================
RCS file: /cvs/cluster/cluster/fence/agents/mcdata/fence_mcdata.pl,v
retrieving revision 1.3
diff -u -r1.3 fence_mcdata.pl
--- fence/agents/mcdata/fence_mcdata.pl	12 Feb 2007 20:17:06 -0000	1.3
+++ fence/agents/mcdata/fence_mcdata.pl	21 Aug 2007 06:02:21 -0000
@@ -34,7 +34,7 @@
 # "#END_VERSION_GENERATION"  It is generated by the Makefile
 
 #BEGIN_VERSION_GENERATION
-$FENCE_RELEASE_NAME="";
+$RELEASE_VERSION="";
 $REDHAT_COPYRIGHT="";
 $BUILD_DATE="";
 #END_VERSION_GENERATION
@@ -78,7 +78,7 @@
 
 sub version
 {
-  print "$pname $FENCE_RELEASE_NAME $BUILD_DATE\n";
+  print "$pname $RELEASE_VERSION $BUILD_DATE\n";
   print "$REDHAT_COPYRIGHT\n" if ( $REDHAT_COPYRIGHT );
 
   exit 0;
Index: fence/agents/rackswitch/Makefile
===================================================================
RCS file: /cvs/cluster/cluster/fence/agents/rackswitch/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- fence/agents/rackswitch/Makefile	1 Jun 2007 09:45:32 -0000	1.5
+++ fence/agents/rackswitch/Makefile	21 Aug 2007 06:02:21 -0000
@@ -17,7 +17,6 @@
 
 OBJS=	do_rack.o
 
-CFLAGS += -DFENCE_RELEASE_NAME=\"${RELEASE}\"
 CFLAGS += -I${incdir}
 
 all: ${TARGET}
Index: fence/agents/rackswitch/do_rack.c
===================================================================
RCS file: /cvs/cluster/cluster/fence/agents/rackswitch/do_rack.c,v
retrieving revision 1.2
diff -u -r1.2 do_rack.c
--- fence/agents/rackswitch/do_rack.c	13 Feb 2007 19:23:40 -0000	1.2
+++ fence/agents/rackswitch/do_rack.c	21 Aug 2007 06:02:22 -0000
@@ -219,7 +219,7 @@
 	    break;
 
 	  case 'V':
-	    printf("%s %s (built %s %s)\n", pname, FENCE_RELEASE_NAME,
+	    printf("%s %s (built %s %s)\n", pname, RELEASE_VERSION,
 		   __DATE__, __TIME__);
 	    printf("%s\n", REDHAT_COPYRIGHT);
 	    exit(DID_SUCCESS);
Index: fence/agents/rps10/Makefile
===================================================================
RCS file: /cvs/cluster/cluster/fence/agents/rps10/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- fence/agents/rps10/Makefile	1 Jun 2007 09:45:32 -0000	1.5
+++ fence/agents/rps10/Makefile	21 Aug 2007 06:02:22 -0000
@@ -17,7 +17,6 @@
 
 OBJS=	rps10.o
 
-CFLAGS+= -DFENCE_RELEASE_NAME=\"${RELEASE}\"
 CFLAGS += -I${incdir}
 
 all: ${TARGET}
Index: fence/agents/rps10/rps10.c
===================================================================
RCS file: /cvs/cluster/cluster/fence/agents/rps10/rps10.c,v
retrieving revision 1.3
diff -u -r1.3 rps10.c
--- fence/agents/rps10/rps10.c	13 Feb 2007 19:23:40 -0000	1.3
+++ fence/agents/rps10/rps10.c	21 Aug 2007 06:02:22 -0000
@@ -426,7 +426,7 @@
 				break;
 			case 'V':
         			printf("%s %s (built %s %s)\n", pname,
-				       FENCE_RELEASE_NAME,
+				       RELEASE_VERSION,
                				__DATE__, __TIME__);
         			printf("%s\n",
 				       REDHAT_COPYRIGHT);
Index: fence/agents/rsa/Makefile
===================================================================
RCS file: /cvs/cluster/cluster/fence/agents/rsa/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- fence/agents/rsa/Makefile	2 May 2007 12:39:33 -0000	1.5
+++ fence/agents/rsa/Makefile	21 Aug 2007 06:02:22 -0000
@@ -20,7 +20,7 @@
 $(TARGET): $(TARGET).py
 	: > $(TARGET)
 	awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(TARGET).py >> $(TARGET)
-	echo "FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(TARGET)
+	echo "RELEASE_VERSION=\"${RELEASE_VERSION}\";" >> $(TARGET)
 	${DEF2VAR} ${BUILDDIR}/config/copyright.cf sh REDHAT_COPYRIGHT >> $(TARGET)
 	echo "BUILD_DATE=\"(built `date`)\";" >> $(TARGET)
 	awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(TARGET).py >> $(TARGET)
Index: fence/agents/rsa/fence_rsa.py
===================================================================
RCS file: /cvs/cluster/cluster/fence/agents/rsa/fence_rsa.py,v
retrieving revision 1.4
diff -u -r1.4 fence_rsa.py
--- fence/agents/rsa/fence_rsa.py	14 Feb 2007 15:42:28 -0000	1.4
+++ fence/agents/rsa/fence_rsa.py	21 Aug 2007 06:02:22 -0000
@@ -26,7 +26,7 @@
 # "#END_VERSION_GENERATION"  It is generated by the Makefile
 
 #BEGIN_VERSION_GENERATION
-FENCE_RELEASE_NAME=""
+RELEASE_VERSION=""
 REDHAT_COPYRIGHT=""
 BUILD_DATE=""
 #END_VERSION_GENERATION
@@ -47,7 +47,7 @@
   sys.exit (0)
 
 def version():
-  print "fence_rsa %s  %s\n" % (FENCE_RELEASE_NAME, BUILD_DATE)
+  print "fence_rsa %s  %s\n" % (RELEASE_VERSION, BUILD_DATE)
   print "%s\n" % REDHAT_COPYRIGHT
   sys.exit(0)
 
Index: fence/agents/rsb/Makefile
===================================================================
RCS file: /cvs/cluster/cluster/fence/agents/rsb/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- fence/agents/rsb/Makefile	2 May 2007 12:39:33 -0000	1.5
+++ fence/agents/rsb/Makefile	21 Aug 2007 06:02:22 -0000
@@ -20,7 +20,7 @@
 $(TARGET): $(TARGET).py
 	: > $(TARGET)
 	awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(TARGET).py >> $(TARGET)
-	echo "FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(TARGET)
+	echo "RELEASE_VERSION=\"${RELEASE_VERSION}\";" >> $(TARGET)
 	${DEF2VAR} ${BUILDDIR}/config/copyright.cf sh REDHAT_COPYRIGHT >> $(TARGET)
 	echo "BUILD_DATE=\"(built `date`)\";" >> $(TARGET)
 	awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(TARGET).py >> $(TARGET)
Index: fence/agents/rsb/fence_rsb.py
===================================================================
RCS file: /cvs/cluster/cluster/fence/agents/rsb/fence_rsb.py,v
retrieving revision 1.2
diff -u -r1.2 fence_rsb.py
--- fence/agents/rsb/fence_rsb.py	14 Feb 2007 15:42:28 -0000	1.2
+++ fence/agents/rsb/fence_rsb.py	21 Aug 2007 06:02:22 -0000
@@ -27,7 +27,7 @@
 # "#END_VERSION_GENERATION"  It is generated by the Makefile
 
 #BEGIN_VERSION_GENERATION
-FENCE_RELEASE_NAME=""
+RELEASE_VERSION=""
 REDHAT_COPYRIGHT=""
 BUILD_DATE=""
 #END_VERSION_GENERATION
@@ -49,7 +49,7 @@
   sys.exit (0)
 
 def version():
-  print "fence_rsb %s  %s\n" % (FENCE_RELEASE_NAME, BUILD_DATE)
+  print "fence_rsb %s  %s\n" % (RELEASE_VERSION, BUILD_DATE)
   print "%s\n" % REDHAT_COPYRIGHT
   sys.exit(0)
 
Index: fence/agents/sanbox2/Makefile
===================================================================
RCS file: /cvs/cluster/cluster/fence/agents/sanbox2/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- fence/agents/sanbox2/Makefile	2 May 2007 12:39:34 -0000	1.4
+++ fence/agents/sanbox2/Makefile	21 Aug 2007 06:02:22 -0000
@@ -20,7 +20,7 @@
 $(TARGET): $(TARGET).pl
 	: > $(TARGET)
 	awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(TARGET).pl >> $(TARGET)
-	echo "\$$FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(TARGET)
+	echo "\$$RELEASE_VERSION=\"${RELEASE_VERSION}\";" >> $(TARGET)
 	${DEF2VAR} ${BUILDDIR}/config/copyright.cf perl REDHAT_COPYRIGHT >> $(TARGET)
 	echo "\$$BUILD_DATE=\"(built `date`)\";" >> $(TARGET)
 	awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(TARGET).pl >> $(TARGET)
Index: fence/agents/sanbox2/fence_sanbox2.pl
===================================================================
RCS file: /cvs/cluster/cluster/fence/agents/sanbox2/fence_sanbox2.pl,v
retrieving revision 1.4
diff -u -r1.4 fence_sanbox2.pl
--- fence/agents/sanbox2/fence_sanbox2.pl	12 Feb 2007 20:17:06 -0000	1.4
+++ fence/agents/sanbox2/fence_sanbox2.pl	21 Aug 2007 06:02:23 -0000
@@ -27,7 +27,7 @@
 # "#END_VERSION_GENERATION"  It is generated by the Makefile
 
 #BEGIN_VERSION_GENERATION
-$FENCE_RELEASE_NAME="";
+$RELEASE_VERSION="";
 $REDHAT_COPYRIGHT="";
 $BUILD_DATE="";
 #END_VERSION_GENERATION
@@ -71,7 +71,7 @@
 
 sub version
 {
-  print "$pname $FENCE_RELEASE_NAME $BUILD_DATE\n";
+  print "$pname $RELEASE_VERSION $BUILD_DATE\n";
   print "$REDHAT_COPYRIGHT\n" if ( $REDHAT_COPYRIGHT );
 
   exit 0;
Index: fence/agents/scsi/Makefile
===================================================================
RCS file: /cvs/cluster/cluster/fence/agents/scsi/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- fence/agents/scsi/Makefile	2 May 2007 12:39:34 -0000	1.12
+++ fence/agents/scsi/Makefile	21 Aug 2007 06:02:23 -0000
@@ -20,7 +20,7 @@
 $(TARGET): $(TARGET).pl
 	: > $(TARGET)
 	awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(TARGET).pl >> $(TARGET)
-	echo "\$$FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(TARGET)
+	echo "\$$RELEASE_VERSION=\"${RELEASE_VERSION}\";" >> $(TARGET)
 	${DEF2VAR} ${BUILDDIR}/config/copyright.cf perl REDHAT_COPYRIGHT >> $(TARGET)
 	echo "\$$BUILD_DATE=\"(built `date`)\";" >> $(TARGET)
 	awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(TARGET).pl >> $(TARGET)
@@ -29,7 +29,7 @@
 $(TARGET)_test: $(TARGET)_test.pl
 	: > $(TARGET)_test
 	awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(TARGET)_test.pl >> $(TARGET)_test
-	echo "\$$FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(TARGET)_test
+	echo "\$$RELEASE_VERSION=\"${RELEASE_VERSION}\";" >> $(TARGET)_test
 	${DEF2VAR} ${BUILDDIR}/config/copyright.cf perl REDHAT_COPYRIGHT >> $(TARGET)_test
 	echo "\$$BUILD_DATE=\"(built `date`)\";" >> $(TARGET)_test
 	awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(TARGET)_test.pl >> $(TARGET)_test
Index: fence/agents/scsi/fence_scsi.pl
===================================================================
RCS file: /cvs/cluster/cluster/fence/agents/scsi/fence_scsi.pl,v
retrieving revision 1.5
diff -u -r1.5 fence_scsi.pl
--- fence/agents/scsi/fence_scsi.pl	12 Jul 2006 20:34:17 -0000	1.5
+++ fence/agents/scsi/fence_scsi.pl	21 Aug 2007 06:02:23 -0000
@@ -15,7 +15,7 @@
 # "#END_VERSION_GENERATION"  It is generated by the Makefile
                                                                                 
 #BEGIN_VERSION_GENERATION
-$FENCE_RELEASE_NAME="";
+$RELEASE_VERSION="";
 $REDHAT_COPYRIGHT="";
 $BUILD_DATE="";
 #END_VERSION_GENERATION
@@ -37,7 +37,7 @@
 
 sub version
 {
-    print "$pname $FENCE_RELEASE_NAME $BUILD_DATE\n";
+    print "$pname $RELEASE_VERSION $BUILD_DATE\n";
     print "$REDHAT_COPYRIGHT\n" if ( $REDHAT_COPYRIGHT );
 
     exit 0;
Index: fence/agents/scsi/fence_scsi_test.pl
===================================================================
RCS file: /cvs/cluster/cluster/fence/agents/scsi/fence_scsi_test.pl,v
retrieving revision 1.2
diff -u -r1.2 fence_scsi_test.pl
--- fence/agents/scsi/fence_scsi_test.pl	6 Mar 2007 19:07:24 -0000	1.2
+++ fence/agents/scsi/fence_scsi_test.pl	21 Aug 2007 06:02:23 -0000
@@ -12,7 +12,7 @@
 # "#END_VERSION_GENERATION"  It is generated by the Makefile
 
 #BEGIN_VERSION_GENERATION
-$FENCE_RELEASE_NAME="";
+$RELEASE_VERSION="";
 $REDHAT_COPYRIGHT="";
 $BUILD_DATE="";
 #END_VERSION_GENERATION
Index: fence/agents/vixel/Makefile
===================================================================
RCS file: /cvs/cluster/cluster/fence/agents/vixel/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- fence/agents/vixel/Makefile	2 May 2007 12:39:34 -0000	1.4
+++ fence/agents/vixel/Makefile	21 Aug 2007 06:02:23 -0000
@@ -20,7 +20,7 @@
 $(TARGET): $(TARGET).pl
 	: > $(TARGET)
 	awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(TARGET).pl >> $(TARGET)
-	echo "\$$FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(TARGET)
+	echo "\$$RELEASE_VERSION=\"${RELEASE_VERSION}\";" >> $(TARGET)
 	${DEF2VAR} ${BUILDDIR}/config/copyright.cf perl REDHAT_COPYRIGHT >> $(TARGET)
 	echo "\$$BUILD_DATE=\"(built `date`)\";" >> $(TARGET)
 	awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(TARGET).pl >> $(TARGET)
Index: fence/agents/vixel/fence_vixel.pl
===================================================================
RCS file: /cvs/cluster/cluster/fence/agents/vixel/fence_vixel.pl,v
retrieving revision 1.3
diff -u -r1.3 fence_vixel.pl
--- fence/agents/vixel/fence_vixel.pl	12 Feb 2007 20:17:07 -0000	1.3
+++ fence/agents/vixel/fence_vixel.pl	21 Aug 2007 06:02:23 -0000
@@ -25,7 +25,7 @@
 # "#END_VERSION_GENERATION"  It is generated by the Makefile
 
 #BEGIN_VERSION_GENERATION
-$FENCE_RELEASE_NAME="";
+$RELEASE_VERSION="";
 $REDHAT_COPYRIGHT="";
 $BUILD_DATE="";
 #END_VERSION_GENERATION
@@ -64,7 +64,7 @@
 
 sub version
 {
-  print "$pname $FENCE_RELEASE_NAME $BUILD_DATE\n";
+  print "$pname $RELEASE_VERSION $BUILD_DATE\n";
   print "$REDHAT_COPYRIGHT\n" if ( $REDHAT_COPYRIGHT );
 
   exit 0;
Index: fence/agents/vmware/Makefile
===================================================================
RCS file: /cvs/cluster/cluster/fence/agents/vmware/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- fence/agents/vmware/Makefile	2 May 2007 12:39:34 -0000	1.3
+++ fence/agents/vmware/Makefile	21 Aug 2007 06:02:23 -0000
@@ -20,7 +20,7 @@
 $(TARGET): $(TARGET).pl
 	: > $(TARGET)
 	awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(TARGET).pl >> $(TARGET)
-	echo "\$$FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(TARGET)
+	echo "\$$RELEASE_VERSION=\"${RELEASE_VERSION}\";" >> $(TARGET)
 	${DEF2VAR} ${BUILDDIR}/config/copyright.cf perl REDHAT_COPYRIGHT >> $(TARGET)
 	echo "\$$BUILD_DATE=\"(built `date`)\";" >> $(TARGET)
 	awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(TARGET).pl >> $(TARGET)
Index: fence/agents/vmware/fence_vmware.pl
===================================================================
RCS file: /cvs/cluster/cluster/fence/agents/vmware/fence_vmware.pl,v
retrieving revision 1.3
diff -u -r1.3 fence_vmware.pl
--- fence/agents/vmware/fence_vmware.pl	3 Apr 2007 18:24:36 -0000	1.3
+++ fence/agents/vmware/fence_vmware.pl	21 Aug 2007 06:02:23 -0000
@@ -99,7 +99,7 @@
 
 sub version
 {
-	print "$pname $FENCE_RELEASE_NAME $BUILD_DATE\n";
+	print "$pname $RELEASE_VERSION $BUILD_DATE\n";
 	print "$REDHAT_COPYRIGHT\n" if ( $REDHAT_COPYRIGHT );
 	exit 0;
 }
Index: fence/agents/wti/Makefile
===================================================================
RCS file: /cvs/cluster/cluster/fence/agents/wti/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- fence/agents/wti/Makefile	2 May 2007 12:39:34 -0000	1.4
+++ fence/agents/wti/Makefile	21 Aug 2007 06:02:23 -0000
@@ -20,7 +20,7 @@
 $(TARGET): $(TARGET).pl
 	: > $(TARGET)
 	awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(TARGET).pl >> $(TARGET)
-	echo "\$$FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(TARGET)
+	echo "\$$RELEASE_VERSION=\"${RELEASE_VERSION}\";" >> $(TARGET)
 	${DEF2VAR} ${BUILDDIR}/config/copyright.cf perl REDHAT_COPYRIGHT >> $(TARGET)
 	echo "\$$BUILD_DATE=\"(built `date`)\";" >> $(TARGET)
 	awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(TARGET).pl >> $(TARGET)
Index: fence/agents/wti/fence_wti.pl
===================================================================
RCS file: /cvs/cluster/cluster/fence/agents/wti/fence_wti.pl,v
retrieving revision 1.7
diff -u -r1.7 fence_wti.pl
--- fence/agents/wti/fence_wti.pl	12 Feb 2007 20:17:08 -0000	1.7
+++ fence/agents/wti/fence_wti.pl	21 Aug 2007 06:02:23 -0000
@@ -26,7 +26,7 @@
 # "#END_VERSION_GENERATION"  It is generated by the Makefile
 
 #BEGIN_VERSION_GENERATION
-$FENCE_RELEASE_NAME="";
+$RELEASE_VERSION="";
 $REDHAT_COPYRIGHT="";
 $BUILD_DATE="";
 #END_VERSION_GENERATION
@@ -70,7 +70,7 @@
 
 sub version
 {
-  print "$pname $FENCE_RELEASE_NAME $BUILD_DATE\n";
+  print "$pname $RELEASE_VERSION $BUILD_DATE\n";
   print "$REDHAT_COPYRIGHT\n" if ( $REDHAT_COPYRIGHT );
 
   exit 0;
Index: fence/agents/xcat/Makefile
===================================================================
RCS file: /cvs/cluster/cluster/fence/agents/xcat/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- fence/agents/xcat/Makefile	2 May 2007 12:39:34 -0000	1.3
+++ fence/agents/xcat/Makefile	21 Aug 2007 06:02:23 -0000
@@ -20,7 +20,7 @@
 $(TARGET): $(TARGET).pl
 	: > $(TARGET)
 	awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(TARGET).pl >> $(TARGET)
-	echo "\$$FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(TARGET)
+	echo "\$$RELEASE_VERSION=\"${RELEASE_VERSION}\";" >> $(TARGET)
 	${DEF2VAR} ${BUILDDIR}/config/copyright.cf perl REDHAT_COPYRIGHT >> $(TARGET)
 	echo "\$$BUILD_DATE=\"(built `date`)\";" >> $(TARGET)
 	awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(TARGET).pl >> $(TARGET)
Index: fence/agents/xcat/fence_xcat.pl
===================================================================
RCS file: /cvs/cluster/cluster/fence/agents/xcat/fence_xcat.pl,v
retrieving revision 1.3
diff -u -r1.3 fence_xcat.pl
--- fence/agents/xcat/fence_xcat.pl	12 Feb 2007 20:17:08 -0000	1.3
+++ fence/agents/xcat/fence_xcat.pl	21 Aug 2007 06:02:23 -0000
@@ -23,7 +23,7 @@
 # "#END_VERSION_GENERATION"  It is generated by the Makefile
 
 #BEGIN_VERSION_GENERATION
-$FENCE_RELEASE_NAME="";
+$RELEASE_VERSION="";
 $REDHAT_COPYRIGHT="";
 $BUILD_DATE="";
 #END_VERSION_GENERATION
@@ -64,7 +64,7 @@
 
 sub version
 {
-  print "$pname $FENCE_RELEASE_NAME $BUILD_DATE\n";
+  print "$pname $RELEASE_VERSION $BUILD_DATE\n";
   print "$REDHAT_COPYRIGHT\n" if ( $REDHAT_COPYRIGHT );
 
   exit 0;
Index: fence/agents/xen/Makefile
===================================================================
RCS file: /cvs/cluster/cluster/fence/agents/xen/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- fence/agents/xen/Makefile	2 May 2007 12:39:34 -0000	1.3
+++ fence/agents/xen/Makefile	21 Aug 2007 06:02:23 -0000
@@ -20,7 +20,7 @@
 $(TARGET): $(TARGET).pl
 	: > $(TARGET)
 	awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(TARGET).pl >> $(TARGET)
-	echo "\$$FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(TARGET)
+	echo "\$$RELEASE_VERSION=\"${RELEASE_VERSION}\";" >> $(TARGET)
 	${DEF2VAR} ${BUILDDIR}/config/copyright.cf perl REDHAT_COPYRIGHT >> $(TARGET)
 	echo "\$$BUILD_DATE=\"(built `date`)\";" >> $(TARGET)
 	awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(TARGET).pl >> $(TARGET)
Index: fence/agents/xen/fence_xen.pl
===================================================================
RCS file: /cvs/cluster/cluster/fence/agents/xen/fence_xen.pl,v
retrieving revision 1.3
diff -u -r1.3 fence_xen.pl
--- fence/agents/xen/fence_xen.pl	12 Feb 2007 20:17:08 -0000	1.3
+++ fence/agents/xen/fence_xen.pl	21 Aug 2007 06:02:23 -0000
@@ -35,7 +35,7 @@
 # "#END_VERSION_GENERATION"  It is generated by the Makefile
 
 #BEGIN_VERSION_GENERATION
-$FENCE_RELEASE_NAME="";
+$RELEASE_VERSION="";
 $REDHAT_COPYRIGHT="";
 $BUILD_DATE="";
 #END_VERSION_GENERATION
@@ -82,7 +82,7 @@
 
 sub version
 {
-	print "$pname $FENCE_RELEASE_NAME $BUILD_DATE\n";
+	print "$pname $RELEASE_VERSION $BUILD_DATE\n";
 	print "$REDHAT_COPYRIGHT\n" if ( $REDHAT_COPYRIGHT );
 	exit 0;
 }
Index: fence/agents/xvm/Makefile
===================================================================
RCS file: /cvs/cluster/cluster/fence/agents/xvm/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- fence/agents/xvm/Makefile	5 Jul 2007 14:27:27 -0000	1.12
+++ fence/agents/xvm/Makefile	21 Aug 2007 06:02:24 -0000
@@ -33,7 +33,7 @@
 		options.o \
 		debug.o
 
-CFLAGS += -DFENCE_RELEASE_NAME=\"${RELEASE}\" -D_GNU_SOURCE
+CFLAGS += -D_GNU_SOURCE
 CFLAGS += -Wall -Werror -Wstrict-prototypes -Wshadow -ggdb
 CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${openaisincdir}
 CFLAGS += -I${virtincdir} -I${nssincdir} -I${nsprincdir}
Index: fence/agents/xvm/fence_xvm.c
===================================================================
RCS file: /cvs/cluster/cluster/fence/agents/xvm/fence_xvm.c,v
retrieving revision 1.5
diff -u -r1.5 fence_xvm.c
--- fence/agents/xvm/fence_xvm.c	6 Mar 2007 15:32:49 -0000	1.5
+++ fence/agents/xvm/fence_xvm.c	21 Aug 2007 06:02:24 -0000
@@ -333,8 +333,8 @@
 
 	if (args.flags & F_VERSION) {
 		printf("%s %s\n", basename(argv[0]), XVM_VERSION);
-#ifdef FENCE_RELEASE_NAME
-		printf("fence release %s\n", FENCE_RELEASE_NAME);
+#ifdef RELEASE_VERSION
+		printf("fence release %s\n", RELEASE_VERSION);
 #endif
 		exit(0);
 	}
Index: fence/agents/xvm/fence_xvmd.c
===================================================================
RCS file: /cvs/cluster/cluster/fence/agents/xvm/fence_xvmd.c,v
retrieving revision 1.9
diff -u -r1.9 fence_xvmd.c
--- fence/agents/xvm/fence_xvmd.c	26 Jun 2007 17:23:41 -0000	1.9
+++ fence/agents/xvm/fence_xvmd.c	21 Aug 2007 06:02:24 -0000
@@ -700,8 +700,8 @@
 
 	if (args.flags & F_VERSION) {
 		printf("%s %s\n", basename(argv[0]), XVM_VERSION);
-#ifdef FENCE_RELEASE_NAME
-		printf("fence release %s\n", FENCE_RELEASE_NAME);
+#ifdef RELEASE_VERSION
+		printf("fence release %s\n", RELEASE_VERSION);
 #endif
 		exit(0);
 	}
Index: fence/agents/zvm/Makefile
===================================================================
RCS file: /cvs/cluster/cluster/fence/agents/zvm/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- fence/agents/zvm/Makefile	2 May 2007 12:39:34 -0000	1.3
+++ fence/agents/zvm/Makefile	21 Aug 2007 06:02:24 -0000
@@ -20,7 +20,7 @@
 $(TARGET): $(TARGET).pl
 	: > $(TARGET)
 	awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(TARGET).pl >> $(TARGET)
-	echo "\$$FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(TARGET)
+	echo "\$$RELEASE_VERSION=\"${RELEASE_VERSION}\";" >> $(TARGET)
 	${DEF2VAR} ${BUILDDIR}/config/copyright.cf perl REDHAT_COPYRIGHT >> $(TARGET)
 	echo "\$$BUILD_DATE=\"(built `date`)\";" >> $(TARGET)
 	awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(TARGET).pl >> $(TARGET)
Index: fence/agents/zvm/fence_zvm.pl
===================================================================
RCS file: /cvs/cluster/cluster/fence/agents/zvm/fence_zvm.pl,v
retrieving revision 1.2
diff -u -r1.2 fence_zvm.pl
--- fence/agents/zvm/fence_zvm.pl	12 Feb 2007 20:17:08 -0000	1.2
+++ fence/agents/zvm/fence_zvm.pl	21 Aug 2007 06:02:24 -0000
@@ -25,7 +25,7 @@
 # "#END_VERSION_GENERATION"  It is generated by the Makefile
 
 #BEGIN_VERSION_GENERATION
-$FENCE_RELEASE_NAME="";
+$RELEASE_VERSION="";
 $REDHAT_COPYRIGHT="";
 $BUILD_DATE="";
 #END_VERSION_GENERATION
@@ -71,7 +71,7 @@
 
 sub version
 {
-  print "$pname $FENCE_RELEASE_NAME $BUILD_DATE\n";
+  print "$pname $RELEASE_VERSION $BUILD_DATE\n";
   print "$REDHAT_COPYRIGHT\n" if ( $REDHAT_COPYRIGHT );
 
   exit 0;
Index: fence/fence_node/Makefile
===================================================================
RCS file: /cvs/cluster/cluster/fence/fence_node/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- fence/fence_node/Makefile	1 Jun 2007 09:45:32 -0000	1.8
+++ fence/fence_node/Makefile	21 Aug 2007 06:02:24 -0000
@@ -18,7 +18,7 @@
 OBJS=	../fenced/agent.o \
 	fence_node.o
 
-CFLAGS += -g -D_FILE_OFFSET_BITS=64 -DFENCE_RELEASE_NAME=\"${RELEASE}\"
+CFLAGS += -g -D_FILE_OFFSET_BITS=64
 
 ifeq ($(DEBUG),y)
 CFLAGS += -O0 -DDEBUG -g
Index: fence/fence_node/fence_node.c
===================================================================
RCS file: /cvs/cluster/cluster/fence/fence_node/fence_node.c,v
retrieving revision 1.8
diff -u -r1.8 fence_node.c
--- fence/fence_node/fence_node.c	22 Feb 2007 16:12:41 -0000	1.8
+++ fence/fence_node/fence_node.c	21 Aug 2007 06:02:24 -0000
@@ -73,7 +73,7 @@
 
 		case 'V':
 			printf("%s %s (built %s %s)\n", prog_name,
-				FENCE_RELEASE_NAME, __DATE__, __TIME__);
+				RELEASE_VERSION, __DATE__, __TIME__);
 			printf("%s\n", REDHAT_COPYRIGHT);
 			exit(EXIT_SUCCESS);
 			break;
Index: fence/fence_tool/Makefile
===================================================================
RCS file: /cvs/cluster/cluster/fence/fence_tool/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- fence/fence_tool/Makefile	1 Jun 2007 09:45:32 -0000	1.15
+++ fence/fence_tool/Makefile	21 Aug 2007 06:02:24 -0000
@@ -18,7 +18,7 @@
 OBJS= ../fenced/agent.o \
 	fence_tool.o
 
-CFLAGS += -D_FILE_OFFSET_BITS=64 -DFENCE_RELEASE_NAME=\"${RELEASE}\"
+CFLAGS += -D_FILE_OFFSET_BITS=64
 CFLAGS += -I${ccsincdir} -I${cmanincdir}
 CFLAGS += -I../include -I../../group/lib
 CFLAGS += -I${incdir}
Index: fence/fence_tool/fence_tool.c
===================================================================
RCS file: /cvs/cluster/cluster/fence/fence_tool/fence_tool.c,v
retrieving revision 1.25
diff -u -r1.25 fence_tool.c
--- fence/fence_tool/fence_tool.c	15 Aug 2007 20:57:28 -0000	1.25
+++ fence/fence_tool/fence_tool.c	21 Aug 2007 06:02:25 -0000
@@ -381,7 +381,7 @@
 
 		case 'V':
 			printf("fence_tool %s (built %s %s)\n",
-			       FENCE_RELEASE_NAME, __DATE__, __TIME__);
+			       RELEASE_VERSION, __DATE__, __TIME__);
 			printf("%s\n", REDHAT_COPYRIGHT);
 			exit(EXIT_SUCCESS);
 			break;
Index: fence/fenced/Makefile
===================================================================
RCS file: /cvs/cluster/cluster/fence/fenced/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- fence/fenced/Makefile	1 Jun 2007 09:45:32 -0000	1.10
+++ fence/fenced/Makefile	21 Aug 2007 06:02:25 -0000
@@ -21,7 +21,7 @@
 	member_cman.o \
 	agent.o 
 
-CFLAGS += -D_FILE_OFFSET_BITS=64 -DFENCE_RELEASE_NAME=\"${RELEASE}\"
+CFLAGS += -D_FILE_OFFSET_BITS=64
 CFLAGS += -g
 CFLAGS += -I${ccsincdir} -I${cmanincdir}
 CFLAGS += -I. -I../include -I../../group/lib
Index: fence/fenced/main.c
===================================================================
RCS file: /cvs/cluster/cluster/fence/fenced/main.c,v
retrieving revision 1.42
diff -u -r1.42 main.c
--- fence/fenced/main.c	15 Aug 2007 20:55:02 -0000	1.42
+++ fence/fenced/main.c	21 Aug 2007 06:02:25 -0000
@@ -607,7 +607,7 @@
 			break;
 
 		case 'V':
-			printf("fenced %s (built %s %s)\n", FENCE_RELEASE_NAME,
+			printf("fenced %s (built %s %s)\n", RELEASE_VERSION,
 				 __DATE__, __TIME__);
 			printf("%s\n", REDHAT_COPYRIGHT);
 			exit(EXIT_SUCCESS);
Index: gfs/gfs_debug/Makefile
===================================================================
RCS file: /cvs/cluster/cluster/gfs/gfs_debug/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- gfs/gfs_debug/Makefile	1 Jun 2007 09:45:32 -0000	1.8
+++ gfs/gfs_debug/Makefile	21 Aug 2007 06:02:25 -0000
@@ -22,7 +22,7 @@
 	readfile.o \
 	util.o
 
-CFLAGS += -DHELPER_PROGRAM -D_FILE_OFFSET_BITS=64 -DGFS_RELEASE_NAME=\"${RELEASE}\"
+CFLAGS += -DHELPER_PROGRAM -D_FILE_OFFSET_BITS=64
 CFLAGS += -O2
 CFLAGS += -I${gfskincdir}
 CFLAGS += -I../include
Index: gfs/gfs_debug/main.c
===================================================================
RCS file: /cvs/cluster/cluster/gfs/gfs_debug/main.c,v
retrieving revision 1.2
diff -u -r1.2 main.c
--- gfs/gfs_debug/main.c	21 Aug 2006 21:44:27 -0000	1.2
+++ gfs/gfs_debug/main.c	21 Aug 2007 06:02:25 -0000
@@ -105,7 +105,7 @@
 			exit(EXIT_SUCCESS);
 
 		case 'V':
-			printf("gfs_mkfs %s (built %s %s)\n", GFS_RELEASE_NAME, __DATE__, __TIME__);
+			printf("gfs_mkfs %s (built %s %s)\n", RELEASE_VERSION, __DATE__, __TIME__);
 			printf("%s\n", REDHAT_COPYRIGHT);
 			exit(EXIT_SUCCESS);
 
Index: gfs/gfs_edit/Makefile
===================================================================
RCS file: /cvs/cluster/cluster/gfs/gfs_edit/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- gfs/gfs_edit/Makefile	1 Jun 2007 09:45:33 -0000	1.9
+++ gfs/gfs_edit/Makefile	21 Aug 2007 06:02:25 -0000
@@ -18,7 +18,7 @@
 OBJS= gfshex.o \
       hexedit.o
 
-CFLAGS += -DHELPER_PROGRAM -D_FILE_OFFSET_BITS=64 -DGFS_RELEASE_NAME=\"${RELEASE}\"
+CFLAGS += -DHELPER_PROGRAM -D_FILE_OFFSET_BITS=64
 CFLAGS += -I${gfskincdir} -I${ncursesincdir}
 CFLAGS += -I../include
 CFLAGS += -I${incdir}
Index: gfs/gfs_edit/hexedit.c
===================================================================
RCS file: /cvs/cluster/cluster/gfs/gfs_edit/hexedit.c,v
retrieving revision 1.2
diff -u -r1.2 hexedit.c
--- gfs/gfs_edit/hexedit.c	10 Jul 2006 23:30:56 -0000	1.2
+++ gfs/gfs_edit/hexedit.c	21 Aug 2007 06:02:26 -0000
@@ -546,7 +546,7 @@
 		if (!strcasecmp(argv[i], "-verbose"))
 			verbose = TRUE;
 		else if (!strcasecmp(argv[i], "-V")) {
-			printf("%s %s (built %s %s)\n", prog_name, GFS_RELEASE_NAME,
+			printf("%s %s (built %s %s)\n", prog_name, RELEASE_VERSION,
 				__DATE__, __TIME__);
 			printf("%s\n", REDHAT_COPYRIGHT);
 			exit(0);
Index: gfs/gfs_fsck/Makefile
===================================================================
RCS file: /cvs/cluster/cluster/gfs/gfs_fsck/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- gfs/gfs_fsck/Makefile	1 Jun 2007 09:45:33 -0000	1.11
+++ gfs/gfs_fsck/Makefile	21 Aug 2007 06:02:26 -0000
@@ -46,7 +46,7 @@
 	super.o \
 	util.o
 
-CFLAGS += -D_FILE_OFFSET_BITS=64 -DHELPER_PROGRAM -DGFS_RELEASE_NAME=\"${RELEASE}\"
+CFLAGS += -D_FILE_OFFSET_BITS=64 -DHELPER_PROGRAM
 CFLAGS += -MMD -O2
 CFLAGS += -I../include
 CFLAGS += -I${incdir}
Index: gfs/gfs_fsck/main.c
===================================================================
RCS file: /cvs/cluster/cluster/gfs/gfs_fsck/main.c,v
retrieving revision 1.6
diff -u -r1.6 main.c
--- gfs/gfs_fsck/main.c	3 Apr 2007 17:14:58 -0000	1.6
+++ gfs/gfs_fsck/main.c	21 Aug 2007 06:02:26 -0000
@@ -57,7 +57,7 @@
 void version(void)
 {
 	printf("GFS fsck %s (built %s %s)\n",
-	       GFS_RELEASE_NAME, __DATE__, __TIME__);
+	       RELEASE_VERSION, __DATE__, __TIME__);
 	printf("%s\n", REDHAT_COPYRIGHT);
 }
 
Index: gfs/gfs_grow/Makefile
===================================================================
RCS file: /cvs/cluster/cluster/gfs/gfs_grow/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- gfs/gfs_grow/Makefile	1 Jun 2007 09:45:33 -0000	1.10
+++ gfs/gfs_grow/Makefile	21 Aug 2007 06:02:26 -0000
@@ -18,7 +18,7 @@
 OBJS= main.o \
       ondisk.o
 
-CFLAGS += -DHELPER_PROGRAM -D_FILE_OFFSET_BITS=64 -DGFS_RELEASE_NAME=\"${RELEASE}\"
+CFLAGS += -DHELPER_PROGRAM -D_FILE_OFFSET_BITS=64
 CFLAGS += -I${gfskincdir}
 CFLAGS += -I../include -I../libgfs
 CFLAGS += -I${incdir}
Index: gfs/gfs_grow/main.c
===================================================================
RCS file: /cvs/cluster/cluster/gfs/gfs_grow/main.c,v
retrieving revision 1.6
diff -u -r1.6 main.c
--- gfs/gfs_grow/main.c	17 Jan 2007 19:06:23 -0000	1.6
+++ gfs/gfs_grow/main.c	21 Aug 2007 06:02:27 -0000
@@ -851,7 +851,7 @@
 			break;
 		case 'V':
 			printf("%s %s (built %s %s)\n", argv[0],
-			       GFS_RELEASE_NAME, __DATE__, __TIME__);
+			       RELEASE_VERSION, __DATE__, __TIME__);
 			printf("%s\n", REDHAT_COPYRIGHT);
 			exit(0);
 		case 'h':
Index: gfs/gfs_jadd/Makefile
===================================================================
RCS file: /cvs/cluster/cluster/gfs/gfs_jadd/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- gfs/gfs_jadd/Makefile	1 Jun 2007 09:45:33 -0000	1.10
+++ gfs/gfs_jadd/Makefile	21 Aug 2007 06:02:27 -0000
@@ -18,7 +18,7 @@
 OBJS= main.o \
       ondisk.o
 
-CFLAGS += -DHELPER_PROGRAM -D_FILE_OFFSET_BITS=64 -DGFS_RELEASE_NAME=\"${RELEASE}\"
+CFLAGS += -DHELPER_PROGRAM -D_FILE_OFFSET_BITS=64
 CFLAGS += -I${gfskincdir}
 CFLAGS += -I../include -I../libgfs
 CFLAGS += -I${incdir}
Index: gfs/gfs_jadd/main.c
===================================================================
RCS file: /cvs/cluster/cluster/gfs/gfs_jadd/main.c,v
retrieving revision 1.5
diff -u -r1.5 main.c
--- gfs/gfs_jadd/main.c	21 Aug 2006 21:44:28 -0000	1.5
+++ gfs/gfs_jadd/main.c	21 Aug 2007 06:02:27 -0000
@@ -839,7 +839,7 @@
 			break;
 		case 'V':
 			printf("%s %s (built %s %s)\n", argv[0],
-			       GFS_RELEASE_NAME, __DATE__, __TIME__);
+			       RELEASE_VERSION, __DATE__, __TIME__);
 			printf("%s\n", REDHAT_COPYRIGHT);
 			exit(0);
 		case 'h':
Index: gfs/gfs_mkfs/Makefile
===================================================================
RCS file: /cvs/cluster/cluster/gfs/gfs_mkfs/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- gfs/gfs_mkfs/Makefile	1 Jun 2007 09:45:33 -0000	1.10
+++ gfs/gfs_mkfs/Makefile	21 Aug 2007 06:02:27 -0000
@@ -23,7 +23,7 @@
 	ondisk.o \
 	structures.o
 
-CFLAGS += -DHELPER_PROGRAM -D_FILE_OFFSET_BITS=64 -DGFS_RELEASE_NAME=\"${RELEASE}\"
+CFLAGS += -DHELPER_PROGRAM -D_FILE_OFFSET_BITS=64
 CFLAGS += -O2
 CFLAGS += -I${gfskincdir} -I${volidincdir}
 CFLAGS += -I../include -I../libgfs
Index: gfs/gfs_mkfs/main.c
===================================================================
RCS file: /cvs/cluster/cluster/gfs/gfs_mkfs/main.c,v
retrieving revision 1.8
diff -u -r1.8 main.c
--- gfs/gfs_mkfs/main.c	12 Jul 2007 15:45:43 -0000	1.8
+++ gfs/gfs_mkfs/main.c	21 Aug 2007 06:02:27 -0000
@@ -151,7 +151,7 @@
 
 
     case 'V':
-      printf("gfs_mkfs %s (built %s %s)\n", GFS_RELEASE_NAME, __DATE__, __TIME__);
+      printf("gfs_mkfs %s (built %s %s)\n", RELEASE_VERSION, __DATE__, __TIME__);
       printf("%s\n", REDHAT_COPYRIGHT);
       exit(EXIT_SUCCESS);
       break;
Index: gfs/gfs_quota/Makefile
===================================================================
RCS file: /cvs/cluster/cluster/gfs/gfs_quota/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- gfs/gfs_quota/Makefile	1 Jun 2007 09:45:33 -0000	1.9
+++ gfs/gfs_quota/Makefile	21 Aug 2007 06:02:27 -0000
@@ -21,7 +21,7 @@
 	ondisk.o \
 	layout.o
 
-CFLAGS += -DHELPER_PROGRAM -D_FILE_OFFSET_BITS=64 -DGFS_RELEASE_NAME=\"${RELEASE}\"
+CFLAGS += -DHELPER_PROGRAM -D_FILE_OFFSET_BITS=64
 CFLAGS += -O2
 CFLAGS += -I${gfskincdir}
 CFLAGS += -I../include
Index: gfs/gfs_quota/main.c
===================================================================
RCS file: /cvs/cluster/cluster/gfs/gfs_quota/main.c,v
retrieving revision 1.4
diff -u -r1.4 main.c
--- gfs/gfs_quota/main.c	4 Apr 2007 21:31:33 -0000	1.4
+++ gfs/gfs_quota/main.c	21 Aug 2007 06:02:28 -0000
@@ -192,7 +192,7 @@
 			break;
 
 		case 'V':
-			printf("gfs_quota %s (built %s %s)\n", GFS_RELEASE_NAME,
+			printf("gfs_quota %s (built %s %s)\n", RELEASE_VERSION,
 			       __DATE__, __TIME__);
 			printf("%s\n", REDHAT_COPYRIGHT);
 			exit(EXIT_SUCCESS);
Index: gfs/gfs_tool/Makefile
===================================================================
RCS file: /cvs/cluster/cluster/gfs/gfs_tool/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- gfs/gfs_tool/Makefile	1 Jun 2007 09:45:33 -0000	1.12
+++ gfs/gfs_tool/Makefile	21 Aug 2007 06:02:28 -0000
@@ -25,7 +25,7 @@
 	tune.o \
 	util.o
 
-CFLAGS += -D_FILE_OFFSET_BITS=64 -DGFS_RELEASE_NAME=\"${RELEASE}\"
+CFLAGS += -D_FILE_OFFSET_BITS=64
 CFLAGS += -O2 -Wall 
 CFLAGS += -I${gfskincdir}
 CFLAGS += -I../include
Index: gfs/gfs_tool/main.c
===================================================================
RCS file: /cvs/cluster/cluster/gfs/gfs_tool/main.c,v
retrieving revision 1.10
diff -u -r1.10 main.c
--- gfs/gfs_tool/main.c	4 Jan 2005 10:07:10 -0000	1.10
+++ gfs/gfs_tool/main.c	21 Aug 2007 06:02:28 -0000
@@ -135,7 +135,7 @@
 print_version(void)
 {
 	printf("gfs_tool %s (built %s %s)\n",
-	       GFS_RELEASE_NAME,
+	       RELEASE_VERSION,
 	       __DATE__, __TIME__);
 	printf("%s\n",
 	       REDHAT_COPYRIGHT);
Index: gfs/libgfs/Makefile
===================================================================
RCS file: /cvs/cluster/cluster/gfs/libgfs/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- gfs/libgfs/Makefile	1 Jun 2007 09:45:33 -0000	1.7
+++ gfs/libgfs/Makefile	21 Aug 2007 06:02:28 -0000
@@ -16,7 +16,7 @@
 TARGET=libgfs.a
 
 CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
-CFLAGS += -D_GNU_SOURCE -DHELPER_PROGRAM -DGFS_RELEASE_NAME=\"${RELEASE}\"
+CFLAGS += -D_GNU_SOURCE -DHELPER_PROGRAM
 CFLAGS += -c -Wall -ggdb 
 CFLAGS += -I${KERNEL_SRC}/fs/gfs2/ -I${KERNEL_SRC}/include/
 CFLAGS += -I${gfskincdir} -I../include
Index: gfs-kernel/src/gfs/gfs.h
===================================================================
RCS file: /cvs/cluster/cluster/gfs-kernel/src/gfs/gfs.h,v
retrieving revision 1.13
diff -u -r1.13 gfs.h
--- gfs-kernel/src/gfs/gfs.h	5 Oct 2006 16:04:38 -0000	1.13
+++ gfs-kernel/src/gfs/gfs.h	21 Aug 2007 06:02:28 -0000
@@ -14,7 +14,7 @@
 #ifndef __GFS_DOT_H__
 #define __GFS_DOT_H__
 
-#define GFS_RELEASE_NAME "<CVS>"
+#define RELEASE_VERSION "<CVS>"
 
 #include <linux/lm_interface.h>
 
Index: gfs-kernel/src/gfs/main.c
===================================================================
RCS file: /cvs/cluster/cluster/gfs-kernel/src/gfs/main.c,v
retrieving revision 1.10
diff -u -r1.10 main.c
--- gfs-kernel/src/gfs/main.c	23 Jul 2007 16:41:46 -0000	1.10
+++ gfs-kernel/src/gfs/main.c	21 Aug 2007 06:02:28 -0000
@@ -81,7 +81,7 @@
 		goto fail;
 
 	printk("GFS %s (built %s %s) installed\n",
-	       GFS_RELEASE_NAME, __DATE__, __TIME__);
+	       RELEASE_VERSION, __DATE__, __TIME__);
 
 	return 0;
 
@@ -125,7 +125,7 @@
 	gfs_sys_uninit();
 }
 
-MODULE_DESCRIPTION("Global File System " GFS_RELEASE_NAME);
+MODULE_DESCRIPTION("Global File System " RELEASE_VERSION);
 MODULE_AUTHOR("Red Hat, Inc.");
 MODULE_LICENSE("GPL");
 
Index: gfs2/convert/Makefile
===================================================================
RCS file: /cvs/cluster/cluster/gfs2/convert/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- gfs2/convert/Makefile	1 Jun 2007 09:45:34 -0000	1.9
+++ gfs2/convert/Makefile	21 Aug 2007 06:02:28 -0000
@@ -16,7 +16,7 @@
 
 OBJS= gfs2_convert.o
 
-CFLAGS += -D_FILE_OFFSET_BITS=64 -DHELPER_PROGRAM -DGFS2_RELEASE_NAME=\"${RELEASE}\"
+CFLAGS += -D_FILE_OFFSET_BITS=64 -DHELPER_PROGRAM
 CFLAGS += -Wall -g
 CFLAGS += -I${KERNEL_SRC}/fs/gfs2/ -I${KERNEL_SRC}/include/
 CFLAGS += -I../include -I../libgfs2
Index: gfs2/convert/gfs2_convert.c
===================================================================
RCS file: /cvs/cluster/cluster/gfs2/convert/gfs2_convert.c,v
retrieving revision 1.11
diff -u -r1.11 gfs2_convert.c
--- gfs2/convert/gfs2_convert.c	15 Aug 2007 22:28:18 -0000	1.11
+++ gfs2/convert/gfs2_convert.c	21 Aug 2007 06:02:29 -0000
@@ -820,7 +820,7 @@
 /* ------------------------------------------------------------------------- */
 void version(void)
 {
-	log_notice("gfs2_convert version %s (built %s %s)\n", GFS2_RELEASE_NAME,
+	log_notice("gfs2_convert version %s (built %s %s)\n", RELEASE_VERSION,
 			   __DATE__, __TIME__);
 	log_notice("%s\n\n", REDHAT_COPYRIGHT);
 }
Index: gfs2/debug/Makefile
===================================================================
RCS file: /cvs/cluster/cluster/gfs2/debug/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- gfs2/debug/Makefile	11 Aug 2006 15:18:12 -0000	1.3
+++ gfs2/debug/Makefile	21 Aug 2007 06:02:29 -0000
@@ -24,8 +24,7 @@
 	readfile.c \
 	util.c
 
-CFLAGS+= -O2 -DHELPER_PROGRAM -D_FILE_OFFSET_BITS=64 \
-	-DGFS2_RELEASE_NAME=\"${RELEASE}\"
+CFLAGS+= -O2 -DHELPER_PROGRAM -D_FILE_OFFSET_BITS=64
 
 INCLUDE= -I${top_srcdir}/include -I${top_srcdir}/config \
 	-I${gfs2kincdir} -I${incdir}
Index: gfs2/debug/main.c
===================================================================
RCS file: /cvs/cluster/cluster/gfs2/debug/main.c,v
retrieving revision 1.1
diff -u -r1.1 main.c
--- gfs2/debug/main.c	26 Apr 2005 02:58:56 -0000	1.1
+++ gfs2/debug/main.c	21 Aug 2007 06:02:29 -0000
@@ -105,7 +105,7 @@
 			exit(EXIT_SUCCESS);
 
 		case 'V':
-			printf("gfs2_mkfs %s (built %s %s)\n", GFS2_RELEASE_NAME, __DATE__, __TIME__);
+			printf("gfs2_mkfs %s (built %s %s)\n", RELEASE_VERSION, __DATE__, __TIME__);
 			printf("%s\n", REDHAT_COPYRIGHT);
 			exit(EXIT_SUCCESS);
 
Index: gfs2/edit/Makefile
===================================================================
RCS file: /cvs/cluster/cluster/gfs2/edit/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- gfs2/edit/Makefile	21 Aug 2007 04:46:43 -0000	1.10
+++ gfs2/edit/Makefile	21 Aug 2007 06:02:29 -0000
@@ -19,7 +19,7 @@
 	savemeta.o \
 	hexedit.o
 
-CFLAGS += -DHELPER_PROGRAM -D_FILE_OFFSET_BITS=64 -DGFS2_RELEASE_NAME=\"${RELEASE}\"
+CFLAGS += -DHELPER_PROGRAM -D_FILE_OFFSET_BITS=64
 CFLAGS += -ggdb 
 CFLAGS += -I${ncursesincdir}
 CFLAGS += -I${KERNEL_SRC}/fs/gfs2/ -I${KERNEL_SRC}/include/
Index: gfs2/edit/hexedit.c
===================================================================
RCS file: /cvs/cluster/cluster/gfs2/edit/hexedit.c,v
retrieving revision 1.18
diff -u -r1.18 hexedit.c
--- gfs2/edit/hexedit.c	30 Jul 2007 15:31:23 -0000	1.18
+++ gfs2/edit/hexedit.c	21 Aug 2007 06:02:30 -0000
@@ -2000,7 +2000,7 @@
 		if (!pass) {
 			if (!strcasecmp(argv[i], "-V")) {
 				printf("%s version %s (built %s %s)\n", prog_name,
-					   GFS2_RELEASE_NAME, __DATE__, __TIME__);
+					   RELEASE_VERSION, __DATE__, __TIME__);
 				printf("%s\n", REDHAT_COPYRIGHT);
 				exit(0);
 			}
Index: gfs2/fsck/Makefile
===================================================================
RCS file: /cvs/cluster/cluster/gfs2/fsck/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- gfs2/fsck/Makefile	15 Aug 2007 22:28:18 -0000	1.13
+++ gfs2/fsck/Makefile	21 Aug 2007 06:02:30 -0000
@@ -34,7 +34,7 @@
 	rgrepair.o \
 	util.o
 
-CFLAGS += -D_FILE_OFFSET_BITS=64 -DHELPER_PROGRAM -DGFS_RELEASE_NAME=\"${RELEASE}\"
+CFLAGS += -D_FILE_OFFSET_BITS=64 -DHELPER_PROGRAM
 CFLAGS += -MMD -Wall -O2
 CFLAGS += -I${KERNEL_SRC}/fs/gfs2/ -I${KERNEL_SRC}/include/
 CFLAGS += -I../include -I../libgfs2
Index: gfs2/fsck/main.c
===================================================================
RCS file: /cvs/cluster/cluster/gfs2/fsck/main.c,v
retrieving revision 1.8
diff -u -r1.8 main.c
--- gfs2/fsck/main.c	15 Aug 2007 22:28:18 -0000	1.8
+++ gfs2/fsck/main.c	21 Aug 2007 06:02:30 -0000
@@ -80,7 +80,7 @@
 void version(void)
 {
 	printf("GFS2 fsck %s (built %s %s)\n",
-	       GFS_RELEASE_NAME, __DATE__, __TIME__);
+	       RELEASE_VERSION, __DATE__, __TIME__);
 	printf("%s\n", REDHAT_COPYRIGHT);
 }
 
Index: gfs2/libgfs2/Makefile
===================================================================
RCS file: /cvs/cluster/cluster/gfs2/libgfs2/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- gfs2/libgfs2/Makefile	1 Jun 2007 09:45:34 -0000	1.8
+++ gfs2/libgfs2/Makefile	21 Aug 2007 06:02:30 -0000
@@ -16,8 +16,7 @@
 TARGET= libgfs2.a
 
 ## Bob: add -O2 back in and take -ggdb out
-CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
-CFLAGS += -D_GNU_SOURCE -DGFS2_RELEASE_NAME=\"${RELEASE}\"
+CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_GNU_SOURCE
 CFLAGS += -Wall -ggdb
 CFLAGS += -I${KERNEL_SRC}/fs/gfs2/ -I${KERNEL_SRC}/include/
 CFLAGS += -I../include
Index: gfs2/mkfs/Makefile
===================================================================
RCS file: /cvs/cluster/cluster/gfs2/mkfs/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- gfs2/mkfs/Makefile	1 Jun 2007 09:45:34 -0000	1.18
+++ gfs2/mkfs/Makefile	21 Aug 2007 06:02:30 -0000
@@ -15,8 +15,7 @@
 	main_grow.o \
 	main_jadd.o
 
-CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
-CFLAGS += -D_GNU_SOURCE -DGFS2_RELEASE_NAME=\"${RELEASE}\"
+CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_GNU_SOURCE
 CFLAGS += -Wall -O2 -ggdb
 CFLAGS += -I${KERNEL_SRC}/include/
 CFLAGS += -I../include/ -I../libgfs2/
Index: gfs2/mkfs/main_grow.c
===================================================================
RCS file: /cvs/cluster/cluster/gfs2/mkfs/main_grow.c,v
retrieving revision 1.4
diff -u -r1.4 main_grow.c
--- gfs2/mkfs/main_grow.c	10 May 2007 15:47:45 -0000	1.4
+++ gfs2/mkfs/main_grow.c	21 Aug 2007 06:02:30 -0000
@@ -80,7 +80,7 @@
 			break;
 		case 'V':
 			printf("%s %s (built %s %s)\n", argv[0],
-			       GFS2_RELEASE_NAME, __DATE__, __TIME__);
+			       RELEASE_VERSION, __DATE__, __TIME__);
 			printf("%s\n", REDHAT_COPYRIGHT);
 			exit(0);
 		case 'h':
Index: gfs2/mkfs/main_jadd.c
===================================================================
RCS file: /cvs/cluster/cluster/gfs2/mkfs/main_jadd.c,v
retrieving revision 1.12
diff -u -r1.12 main_jadd.c
--- gfs2/mkfs/main_jadd.c	26 Jun 2007 01:43:17 -0000	1.12
+++ gfs2/mkfs/main_jadd.c	21 Aug 2007 06:02:30 -0000
@@ -131,7 +131,7 @@
 			sdp->quiet = TRUE;
 			break;
 		case 'V':
-			printf("gfs2_jadd %s (built %s %s)\n", GFS2_RELEASE_NAME,
+			printf("gfs2_jadd %s (built %s %s)\n", RELEASE_VERSION,
 			       __DATE__, __TIME__);
 			printf("%s\n", REDHAT_COPYRIGHT);
 			exit(EXIT_SUCCESS);
Index: gfs2/mkfs/main_mkfs.c
===================================================================
RCS file: /cvs/cluster/cluster/gfs2/mkfs/main_mkfs.c,v
retrieving revision 1.16
diff -u -r1.16 main_mkfs.c
--- gfs2/mkfs/main_mkfs.c	12 Jul 2007 15:45:44 -0000	1.16
+++ gfs2/mkfs/main_mkfs.c	21 Aug 2007 06:02:31 -0000
@@ -151,7 +151,7 @@
 			break;
 
 		case 'V':
-			printf("gfs2_mkfs %s (built %s %s)\n", GFS2_RELEASE_NAME,
+			printf("gfs2_mkfs %s (built %s %s)\n", RELEASE_VERSION,
 			       __DATE__, __TIME__);
 			printf("%s\n", REDHAT_COPYRIGHT);
 			exit(EXIT_SUCCESS);
Index: gfs2/mount/Makefile
===================================================================
RCS file: /cvs/cluster/cluster/gfs2/mount/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- gfs2/mount/Makefile	21 Aug 2007 04:46:43 -0000	1.16
+++ gfs2/mount/Makefile	21 Aug 2007 06:02:31 -0000
@@ -23,8 +23,7 @@
 	    util.o \
 	    mtab.o
 
-CFLAGS += -DHELPER_PROGRAM -D_FILE_OFFSET_BITS=64
-CFLAGS += -DGFS2_RELEASE_NAME=\"${RELEASE}\" -D_GNU_SOURCE
+CFLAGS += -DHELPER_PROGRAM -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
 CFLAGS += -O2
 CFLAGS += -I${gfskincdir}
 CFLAGS += -I${KERNEL_SRC}/fs/gfs2/ -I${KERNEL_SRC}/include/
Index: gfs2/mount/mount.gfs2.c
===================================================================
RCS file: /cvs/cluster/cluster/gfs2/mount/mount.gfs2.c,v
retrieving revision 1.26
diff -u -r1.26 mount.gfs2.c
--- gfs2/mount/mount.gfs2.c	6 Aug 2007 19:23:40 -0000	1.26
+++ gfs2/mount/mount.gfs2.c	21 Aug 2007 06:02:31 -0000
@@ -15,7 +15,7 @@
 
 static void print_version(void)
 {
-	printf("mount.gfs2 %s (built %s %s)\n", GFS2_RELEASE_NAME,
+	printf("mount.gfs2 %s (built %s %s)\n", RELEASE_VERSION,
 	       __DATE__, __TIME__);
 }
 
Index: gfs2/mount/umount.gfs2.c
===================================================================
RCS file: /cvs/cluster/cluster/gfs2/mount/umount.gfs2.c,v
retrieving revision 1.14
diff -u -r1.14 umount.gfs2.c
--- gfs2/mount/umount.gfs2.c	13 Jun 2007 18:12:36 -0000	1.14
+++ gfs2/mount/umount.gfs2.c	21 Aug 2007 06:02:31 -0000
@@ -16,7 +16,7 @@
 
 static void print_version(void)
 {
-	printf("umount.gfs2 %s (built %s %s)\n", GFS2_RELEASE_NAME,
+	printf("umount.gfs2 %s (built %s %s)\n", RELEASE_VERSION,
 	       __DATE__, __TIME__);
 }
 
Index: gfs2/quota/Makefile
===================================================================
RCS file: /cvs/cluster/cluster/gfs2/quota/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- gfs2/quota/Makefile	21 Aug 2007 04:46:43 -0000	1.11
+++ gfs2/quota/Makefile	21 Aug 2007 06:02:31 -0000
@@ -19,8 +19,7 @@
 	names.o \
 	check.o
 
-CFLAGS += -DHELPER_PROGRAM -D_FILE_OFFSET_BITS=64
-CFLAGS += -D_GNU_SOURCE -DGFS2_RELEASE_NAME=\"${RELEASE}\"
+CFLAGS += -DHELPER_PROGRAM -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
 CFLAGS += -O2
 CFLAGS += -I${KERNEL_SRC}/fs/gfs2/ -I${KERNEL_SRC}/include/
 CFLAGS += -I../include -I../libgfs2/
Index: gfs2/quota/main.c
===================================================================
RCS file: /cvs/cluster/cluster/gfs2/quota/main.c,v
retrieving revision 1.6
diff -u -r1.6 main.c
--- gfs2/quota/main.c	31 May 2007 22:32:40 -0000	1.6
+++ gfs2/quota/main.c	21 Aug 2007 06:02:31 -0000
@@ -157,7 +157,7 @@
 			break;
 
 		case 'V':
-			printf("gfs2_quota %s (built %s %s)\n", GFS2_RELEASE_NAME,
+			printf("gfs2_quota %s (built %s %s)\n", RELEASE_VERSION,
 			       __DATE__, __TIME__);
 			printf("%s\n", REDHAT_COPYRIGHT);
 			exit(EXIT_SUCCESS);
Index: gfs2/tool/Makefile
===================================================================
RCS file: /cvs/cluster/cluster/gfs2/tool/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- gfs2/tool/Makefile	21 Aug 2007 04:46:43 -0000	1.10
+++ gfs2/tool/Makefile	21 Aug 2007 06:02:31 -0000
@@ -25,7 +25,7 @@
 	tune.o \
 	util.o
 
-CFLAGS += -D_FILE_OFFSET_BITS=64 -DGFS2_RELEASE_NAME=\"${RELEASE}\"
+CFLAGS += -D_FILE_OFFSET_BITS=64
 CFLAGS += -O2 -Wall
 CFLAGS += -I${KERNEL_SRC}/fs/gfs2/ -I${KERNEL_SRC}/include/
 CFLAGS += -I../include
Index: gfs2/tool/main.c
===================================================================
RCS file: /cvs/cluster/cluster/gfs2/tool/main.c,v
retrieving revision 1.4
diff -u -r1.4 main.c
--- gfs2/tool/main.c	5 May 2006 18:06:09 -0000	1.4
+++ gfs2/tool/main.c	21 Aug 2007 06:02:31 -0000
@@ -139,7 +139,7 @@
 print_version(void)
 {
 	printf("gfs2_tool %s (built %s %s)\n",
-	       GFS2_RELEASE_NAME,
+	       RELEASE_VERSION,
 	       __DATE__, __TIME__);
 	printf("%s\n",
 	       REDHAT_COPYRIGHT);
Index: gnbd/client/Makefile
===================================================================
RCS file: /cvs/cluster/cluster/gnbd/client/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- gnbd/client/Makefile	1 Jun 2007 09:45:35 -0000	1.13
+++ gnbd/client/Makefile	21 Aug 2007 06:02:31 -0000
@@ -25,7 +25,6 @@
 SHAREDOBJS= ../utils/trans.o \
 	    ../utils/gnbd_utils.o
 
-CFLAGS += -DGNBD_RELEASE_NAME=\"${RELEASE}\"
 CFLAGS += -O2
 CFLAGS += -I${gnbdkincdir} -I${cmanincdir}
 CFLAGS += -I../include -I../server -I../utils
Index: gnbd/client/gnbd_recvd.c
===================================================================
RCS file: /cvs/cluster/cluster/gnbd/client/gnbd_recvd.c,v
retrieving revision 1.6
diff -u -r1.6 gnbd_recvd.c
--- gnbd/client/gnbd_recvd.c	11 Aug 2006 15:18:14 -0000	1.6
+++ gnbd/client/gnbd_recvd.c	21 Aug 2007 06:02:32 -0000
@@ -141,7 +141,7 @@
       verbosity = VERBOSE;
       continue;
     case 'V':
-      printf("%s %s (built %s %s)\n", program_name, GNBD_RELEASE_NAME,
+      printf("%s %s (built %s %s)\n", program_name, RELEASE_VERSION,
              __DATE__, __TIME__);
       printf("%s\n", REDHAT_COPYRIGHT);
       exit(0);
Index: gnbd/server/Makefile
===================================================================
RCS file: /cvs/cluster/cluster/gnbd/server/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- gnbd/server/Makefile	1 Jun 2007 09:45:35 -0000	1.13
+++ gnbd/server/Makefile	21 Aug 2007 06:02:32 -0000
@@ -30,7 +30,6 @@
 SHAREDOBJS= ../utils/gnbd_utils.o
 
 CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
-CFLAGS += -DGNBD_RELEASE_NAME=\"${RELEASE}\"
 CFLAGS += -O2
 CFLAGS += -I${gnbdkincdir} -I${cmanincdir}
 CFLAGS += -I../include -I../utils
Index: gnbd/server/gnbd_serv.c
===================================================================
RCS file: /cvs/cluster/cluster/gnbd/server/gnbd_serv.c,v
retrieving revision 1.5
diff -u -r1.5 gnbd_serv.c
--- gnbd/server/gnbd_serv.c	21 Sep 2006 20:00:01 -0000	1.5
+++ gnbd/server/gnbd_serv.c	21 Aug 2007 06:02:32 -0000
@@ -323,7 +323,7 @@
       continue;
       
     case 'V':
-      printf("%s %s (built %s %s)\n", program_name, GNBD_RELEASE_NAME,
+      printf("%s %s (built %s %s)\n", program_name, RELEASE_VERSION,
              __DATE__, __TIME__);
       printf("%s\n", REDHAT_COPYRIGHT);
       exit(0);
Index: gnbd/tools/fence_gnbd/Makefile
===================================================================
RCS file: /cvs/cluster/cluster/gnbd/tools/fence_gnbd/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- gnbd/tools/fence_gnbd/Makefile	1 Jun 2007 09:45:35 -0000	1.5
+++ gnbd/tools/fence_gnbd/Makefile	21 Aug 2007 06:02:32 -0000
@@ -17,7 +17,6 @@
 
 OBJS= main.o
 
-CFLAGS += -DGNBD_RELEASE_NAME=\"${RELEASE}\"
 CFLAGS += -I../../include -I../../tools/gnbd_import
 CFLAGS += -I${incdir}
 
Index: gnbd/tools/fence_gnbd/main.c
===================================================================
RCS file: /cvs/cluster/cluster/gnbd/tools/fence_gnbd/main.c,v
retrieving revision 1.3
diff -u -r1.3 main.c
--- gnbd/tools/fence_gnbd/main.c	21 Sep 2004 21:11:07 -0000	1.3
+++ gnbd/tools/fence_gnbd/main.c	21 Aug 2007 06:02:32 -0000
@@ -128,7 +128,7 @@
       switch(c)
       {
       case 'V':
-        printf("%s %s (built %s %s)\n", pname, GNBD_RELEASE_NAME,
+        printf("%s %s (built %s %s)\n", pname, RELEASE_VERSION,
                 __DATE__, __TIME__);
         printf("%s\n", REDHAT_COPYRIGHT);
         exit(0);
Index: gnbd/tools/gnbd_export/Makefile
===================================================================
RCS file: /cvs/cluster/cluster/gnbd/tools/gnbd_export/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- gnbd/tools/gnbd_export/Makefile	1 Jun 2007 09:45:35 -0000	1.14
+++ gnbd/tools/gnbd_export/Makefile	21 Aug 2007 06:02:32 -0000
@@ -19,7 +19,7 @@
 	../../utils/gnbd_utils.o \
 	../../utils/trans.o
 
-CFLAGS += -DGNBD_RELEASE_NAME=\"${RELEASE}\" -DDEFAULT_GETUID=\"${sbindir}/gnbd_get_uid\"
+CFLAGS += -DDEFAULT_GETUID=\"${sbindir}/gnbd_get_uid\"
 CFLAGS += -O2
 CFLAGS += -I${gnbdkincdir} -I${cmanincdir}
 CFLAGS += -I../../include -I../../server -I../../utils
Index: gnbd/tools/gnbd_export/gnbd_export.c
===================================================================
RCS file: /cvs/cluster/cluster/gnbd/tools/gnbd_export/gnbd_export.c,v
retrieving revision 1.12
diff -u -r1.12 gnbd_export.c
--- gnbd/tools/gnbd_export/gnbd_export.c	30 Apr 2007 11:22:19 -0000	1.12
+++ gnbd/tools/gnbd_export/gnbd_export.c	21 Aug 2007 06:02:33 -0000
@@ -793,7 +793,7 @@
       continue;
     case 'V':
       printf("%s %s (built %s %s)\n", argv[0],
-             GNBD_RELEASE_NAME, __DATE__, __TIME__);
+             RELEASE_VERSION, __DATE__, __TIME__);
       printf("%s\n", REDHAT_COPYRIGHT);
       return 0;
     default:
Index: gnbd/tools/gnbd_import/Makefile
===================================================================
RCS file: /cvs/cluster/cluster/gnbd/tools/gnbd_import/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- gnbd/tools/gnbd_import/Makefile	1 Jun 2007 09:45:35 -0000	1.11
+++ gnbd/tools/gnbd_import/Makefile	21 Aug 2007 06:02:33 -0000
@@ -20,7 +20,6 @@
 	../../client/monitor_req.o \
 	../../utils/trans.o
 
-CFLAGS += -DGNBD_RELEASE_NAME=\"${RELEASE}\"
 CFLAGS += -O2
 CFLAGS += -I${gnbdkincdir} -I${cmanincdir}
 CFLAGS += -I../../include -I../../client -I../../server -I../../utils
Index: gnbd/tools/gnbd_import/gnbd_import.c
===================================================================
RCS file: /cvs/cluster/cluster/gnbd/tools/gnbd_import/gnbd_import.c,v
retrieving revision 1.19
diff -u -r1.19 gnbd_import.c
--- gnbd/tools/gnbd_import/gnbd_import.c	11 Oct 2006 22:10:12 -0000	1.19
+++ gnbd/tools/gnbd_import/gnbd_import.c	21 Aug 2007 06:02:33 -0000
@@ -1241,7 +1241,7 @@
       continue;
     case 'V':
       printf("%s %s (built %s %s)\n", argv[0],
-             GNBD_RELEASE_NAME, __DATE__, __TIME__);
+             RELEASE_VERSION, __DATE__, __TIME__);
       printf("%s\n", REDHAT_COPYRIGHT);
       return 0;
     case 'v':
Index: rgmanager/src/clulib/Makefile
===================================================================
RCS file: /cvs/cluster/cluster/rgmanager/src/clulib/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- rgmanager/src/clulib/Makefile	1 Jun 2007 09:45:36 -0000	1.15
+++ rgmanager/src/clulib/Makefile	21 Aug 2007 06:02:33 -0000
@@ -25,7 +25,6 @@
 
 OBJS3= msgtest.o
 
-CFLAGS += -DCMAN_RELEASE_NAME=\"${RELEASE}\"
 CFLAGS += -g -Werror -Wstrict-prototypes -Wshadow -fPIC -D_GNU_SOURCE
 CFLAGS += -I${cmanincdir} -I${dlmincdir}
 CFLAGS += -I../../include
Index: rgmanager/src/utils/Makefile
===================================================================
RCS file: /cvs/cluster/cluster/rgmanager/src/utils/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- rgmanager/src/utils/Makefile	1 Jun 2007 09:45:36 -0000	1.17
+++ rgmanager/src/utils/Makefile	21 Aug 2007 06:02:33 -0000
@@ -21,7 +21,6 @@
 
 DISABLEDTARGETS= cluarp
 
-CFLAGS += -DPACKAGE_VERSION=\"${RELEASE}\"
 CFLAGS += -g -Werror -Wstrict-prototypes -Wshadow -fPIC -D_GNU_SOURCE
 CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${dlmincdir} -I${ncursesincdir}
 CFLAGS += -I../../include
Index: rgmanager/src/utils/clustat.c
===================================================================
RCS file: /cvs/cluster/cluster/rgmanager/src/utils/clustat.c,v
retrieving revision 1.33
diff -u -r1.33 clustat.c
--- rgmanager/src/utils/clustat.c	15 Aug 2007 18:43:00 -0000	1.33
+++ rgmanager/src/utils/clustat.c	21 Aug 2007 06:02:33 -0000
@@ -951,7 +951,7 @@
 		goto cleanup;
 	case VERSION_ONLY:
 		printf("%s version %s\n", basename(argv[0]),
-		       PACKAGE_VERSION);
+		       RELEASE_VERSION);
 		if (!ch)
 		       break;
 		goto cleanup;
Index: rgmanager/src/utils/clusvcadm.c
===================================================================
RCS file: /cvs/cluster/cluster/rgmanager/src/utils/clusvcadm.c,v
retrieving revision 1.21
diff -u -r1.21 clusvcadm.c
--- rgmanager/src/utils/clusvcadm.c	23 Jul 2007 20:49:13 -0000	1.21
+++ rgmanager/src/utils/clusvcadm.c	21 Aug 2007 06:02:33 -0000
@@ -311,7 +311,7 @@
 			node_specified = 1;
 			break;
 		case 'v':
-			printf("%s\n",PACKAGE_VERSION);
+			printf("%s\n",RELEASE_VERSION);
 			return 0;
 		case 'Z':
 			actionstr = "freezing";

[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]