#! /bin/sh /usr/share/dpatch/dpatch-run
## 001_make_fence_agents_configurable.dpatch by  <fabbione@gordian.int.fabbione.net>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.

@DPATCH@
diff -urNad redhat-cluster-suite-2.20070430~/configure redhat-cluster-suite-2.20070430/configure
--- redhat-cluster-suite-2.20070430~/configure	2007-04-30 13:31:44.000000000 +0200
+++ redhat-cluster-suite-2.20070430/configure	2007-05-01 10:17:27.000000000 +0200
@@ -61,6 +61,7 @@
 	prefix => \$prefix,
 	sbindir => \$sbindir,
 	sharedir => \$sharedir,
+	fence_agents => \$fence_agents,
 	enable_xen => \$enable_xen,
 	release_major => \$release_major,
 	release_minor => \$release_minor,
@@ -106,6 +107,7 @@
 		    'sharedir=s',
 		    'release_major=s',
 		    'release_minor=s',
+		    'fence_agents=s',
 		    'enable_xen');
 
 if(!$err) {
@@ -157,7 +159,9 @@
   print "--virtlibdir=\tthe base directory for libvirt libraries.  (Default: {libdir})\n";
   print "--xenincdir=\tthe base directory for xen include files.  (Default: {incdir}/xen)\n";
   print "--xenlibdir=\tthe base directory for xen libraries.  (Default: {libdir})\n";
-  print "--enable_xen\t\tEnable building of Xen-specific pieces\n";
+  print "--fence_agents=\tlist of fence agents to configure.  (Default: all)\n";
+  print "\t\tUse --fence_agents=help for a list\n";
+  print "--enable_xen\tEnable building of Xen-specific pieces\n";
   exit $ret;
 }
 
@@ -276,6 +280,26 @@
   $sharedir="${prefix}/usr/share/cluster";
 }
 
+@args = "find fence/agents -mindepth 2 -maxdepth 2 -name Makefile -printf '%h'";
+open (IFILE, "@args |");
+while (<IFILE>) {
+  chomp;
+  s|fence\/agents\/| |g;
+  $all_fence = $_;
+}
+close IFILE;
+
+if ($fence_agents eq help) {
+  print "Available fence agents:\n$all_fence\n";
+  exit 0;
+}
+
+if ((!$fence_agents) || ($fence_agents eq all)) {
+  print "\nThe following fence agents will be build on this system:\n$all_fence\n";
+  print "\nNOTE: xvm will build only if --enable_xen has been specified\n\n";
+  $fence_agents = $all_fence
+}
+
 open IFILE, "<make/defines.mk.input" or die "Can't redirect stdin";
 open OFILE, ">make/defines.mk" or die "Can't redirect stdout";
 
@@ -319,6 +343,7 @@
   $_ =~ s/\@MANDIR\@/$mandir/;
   $_ =~ s/\@SBINDIR\@/$sbindir/;
   $_ =~ s/\@SHAREDIR\@/$sharedir/;
+  $_ =~ s/\@FENCE_AGENTS\@/$fence_agents/;
   $_ =~ s/\@ENABLE_XEN\@/$enable_xen/;
   print OFILE "$_\n";
 }
diff -urNad redhat-cluster-suite-2.20070430~/fence/agents/Makefile redhat-cluster-suite-2.20070430/fence/agents/Makefile
--- redhat-cluster-suite-2.20070430~/fence/agents/Makefile	2007-04-30 13:31:47.000000000 +0200
+++ redhat-cluster-suite-2.20070430/fence/agents/Makefile	2007-05-01 10:17:27.000000000 +0200
@@ -13,11 +13,7 @@
 
 include ../../make/defines.mk
 
-SUBDIRS  = apc bladecenter brocade bullpap drac egenera ilo ipmilan
-SUBDIRS += manual mcdata rps10 rsa rsb scsi sanbox2 vixel wti xvm
-
-DISABLEDSUBDIRS  = baytech cpint ibmblade primergy rackswitch 
-DISABLEDSUBDIRS += rib vmware xcat xen zvm
+SUBDIRS = ${fence_agents}
 
 all: ${SUBDIRS}
 
diff -urNad redhat-cluster-suite-2.20070430~/fence/agents/apc/Makefile redhat-cluster-suite-2.20070430/fence/agents/apc/Makefile
--- redhat-cluster-suite-2.20070430~/fence/agents/apc/Makefile	2007-04-30 13:31:47.000000000 +0200
+++ redhat-cluster-suite-2.20070430/fence/agents/apc/Makefile	2007-05-01 10:17:27.000000000 +0200
@@ -13,18 +13,17 @@
 
 include ../../../make/defines.mk
 
-SOURCE= fence_apc.py
 TARGET= fence_apc
 
 all: $(TARGET)
 
-fence_apc: fence_apc.py
+$(TARGET): $(TARGET).py
 	: > $(TARGET)
-	awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(SOURCE) >> $(TARGET)
+	awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(TARGET).py >> $(TARGET)
 	echo "FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(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}" $(SOURCE) >> $(TARGET)
+	awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(TARGET).py >> $(TARGET)
 	chmod +x $(TARGET)
 
 install: all
diff -urNad redhat-cluster-suite-2.20070430~/fence/agents/baytech/Makefile redhat-cluster-suite-2.20070430/fence/agents/baytech/Makefile
--- redhat-cluster-suite-2.20070430~/fence/agents/baytech/Makefile	2006-08-11 17:18:07.000000000 +0200
+++ redhat-cluster-suite-2.20070430/fence/agents/baytech/Makefile	2007-05-01 10:17:27.000000000 +0200
@@ -11,22 +11,19 @@
 ###############################################################################
 ###############################################################################
 
-SOURCE= fence_XXX.pl
-TARGET= fence_XXX
+include ../../../make/defines.mk
 
-top_srcdir=../../..
-include ${top_srcdir}/make/defines.mk
-include ${top_srcdir}/make/flags.mk
+TARGET= fence_baytech
 
 all: $(TARGET)
 
-$(TARGET): $(SOURCE)
+$(TARGET): $(TARGET).pl
 	: > $(TARGET)
-	awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(SOURCE) >> $(TARGET)
+	awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(TARGET).pl >> $(TARGET)
 	echo "\$$FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(TARGET)
-	${top_srcdir}/scripts/define2var ${top_srcdir}/config/copyright.cf perl SISTINA_COPYRIGHT >> $(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}" $(SOURCE) >> $(TARGET)
+	awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(TARGET).pl >> $(TARGET)
 	chmod +x $(TARGET)
 
 install: all
@@ -35,7 +32,8 @@
 	fi
 	install -m755 ${TARGET} ${sbindir}
 
+uninstall:
+	${UNINSTALL} ${TARGET} ${sbindir}
+
 clean:
 	rm -f $(TARGET)
-
-
diff -urNad redhat-cluster-suite-2.20070430~/fence/agents/bladecenter/Makefile redhat-cluster-suite-2.20070430/fence/agents/bladecenter/Makefile
--- redhat-cluster-suite-2.20070430~/fence/agents/bladecenter/Makefile	2007-04-30 13:31:47.000000000 +0200
+++ redhat-cluster-suite-2.20070430/fence/agents/bladecenter/Makefile	2007-05-01 10:17:27.000000000 +0200
@@ -13,18 +13,17 @@
 
 include ../../../make/defines.mk
 
-SOURCE= fence_bladecenter.pl
 TARGET= fence_bladecenter
 
 all: $(TARGET)
 
-fence_bladecenter: fence_bladecenter.pl
+$(TARGET): $(TARGET).pl
 	: > $(TARGET)
-	awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(SOURCE) >> $(TARGET)
+	awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(TARGET).pl >> $(TARGET)
 	echo "\$$FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(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}" $(SOURCE) >> $(TARGET)
+	awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(TARGET).pl >> $(TARGET)
 	chmod +x $(TARGET)
 
 install: all
diff -urNad redhat-cluster-suite-2.20070430~/fence/agents/brocade/Makefile redhat-cluster-suite-2.20070430/fence/agents/brocade/Makefile
--- redhat-cluster-suite-2.20070430~/fence/agents/brocade/Makefile	2007-04-30 13:31:48.000000000 +0200
+++ redhat-cluster-suite-2.20070430/fence/agents/brocade/Makefile	2007-05-01 10:17:27.000000000 +0200
@@ -13,18 +13,17 @@
 
 include ../../../make/defines.mk
 
-SOURCE= fence_brocade.pl
 TARGET= fence_brocade
 
 all: $(TARGET)
 
-$(TARGET): $(SOURCE)
+$(TARGET): $(TARGET).pl
 	: > $(TARGET)
-	awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(SOURCE) >> $(TARGET)
+	awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(TARGET).pl >> $(TARGET)
 	echo "\$$FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(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}" $(SOURCE) >> $(TARGET)
+	awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(TARGET).pl >> $(TARGET)
 	chmod +x $(TARGET)
 
 install: all
diff -urNad redhat-cluster-suite-2.20070430~/fence/agents/bullpap/Makefile redhat-cluster-suite-2.20070430/fence/agents/bullpap/Makefile
--- redhat-cluster-suite-2.20070430~/fence/agents/bullpap/Makefile	2007-04-30 13:31:48.000000000 +0200
+++ redhat-cluster-suite-2.20070430/fence/agents/bullpap/Makefile	2007-05-01 10:17:27.000000000 +0200
@@ -13,18 +13,17 @@
 
 include ../../../make/defines.mk
 
-SOURCE= fence_bullpap.pl
 TARGET= fence_bullpap
 
 all: $(TARGET)
 
-$(TARGET): $(SOURCE)
+$(TARGET): $(TARGET).pl
 	: > $(TARGET)
-	awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(SOURCE) >> $(TARGET)
+	awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(TARGET).pl >> $(TARGET)
 	echo "\$$FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(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}" $(SOURCE) >> $(TARGET)
+	awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(TARGET).pl >> $(TARGET)
 	chmod +x $(TARGET)
 
 install: all
diff -urNad redhat-cluster-suite-2.20070430~/fence/agents/cpint/Makefile redhat-cluster-suite-2.20070430/fence/agents/cpint/Makefile
--- redhat-cluster-suite-2.20070430~/fence/agents/cpint/Makefile	2006-08-11 17:18:07.000000000 +0200
+++ redhat-cluster-suite-2.20070430/fence/agents/cpint/Makefile	2007-05-01 10:17:27.000000000 +0200
@@ -11,21 +11,19 @@
 ###############################################################################
 ###############################################################################
 
-SOURCE= fence_cpint.pl
-TARGET= fence_cpint
+include ../../../make/defines.mk
 
-top_srcdir=../..
-include ${top_srcdir}/make/defines.mk
+TARGET= fence_cpint
 
 all: $(TARGET)
 
-$(TARGET): $(SOURCE)
+$(TARGET): $(TARGET).pl
 	: > $(TARGET)
-	awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(SOURCE) >> $(TARGET)
+	awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(TARGET).pl >> $(TARGET)
 	echo "\$$FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(TARGET)
-	${top_srcdir}/scripts/define2var ${top_srcdir}/config/copyright.cf perl REDHAT_COPYRIGHT >> $(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}" $(SOURCE) >> $(TARGET)
+	awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(TARGET).pl >> $(TARGET)
 	chmod +x $(TARGET)
 
 install: all
@@ -34,6 +32,9 @@
 	fi
 	install -m755 ${TARGET} ${sbindir}
 
+uninstall:
+	${UNINSTALL} ${TARGET} ${sbindir}
+
 clean:
 	rm -f $(TARGET)
 
diff -urNad redhat-cluster-suite-2.20070430~/fence/agents/drac/Makefile redhat-cluster-suite-2.20070430/fence/agents/drac/Makefile
--- redhat-cluster-suite-2.20070430~/fence/agents/drac/Makefile	2007-04-30 13:31:48.000000000 +0200
+++ redhat-cluster-suite-2.20070430/fence/agents/drac/Makefile	2007-05-01 10:17:27.000000000 +0200
@@ -13,18 +13,17 @@
 
 include ../../../make/defines.mk
 
-SOURCE= fence_drac.pl
 TARGET= fence_drac
 
 all: $(TARGET)
 
-fence_drac: fence_drac.pl
+$(TARGET): $(TARGET).pl
 	: > $(TARGET)
-	awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(SOURCE) >> $(TARGET)
+	awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(TARGET).pl >> $(TARGET)
 	echo "\$$FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(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}" $(SOURCE) >> $(TARGET)
+	awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(TARGET).pl >> $(TARGET)
 	chmod +x $(TARGET)
 
 install: all
diff -urNad redhat-cluster-suite-2.20070430~/fence/agents/egenera/Makefile redhat-cluster-suite-2.20070430/fence/agents/egenera/Makefile
--- redhat-cluster-suite-2.20070430~/fence/agents/egenera/Makefile	2007-04-30 13:31:48.000000000 +0200
+++ redhat-cluster-suite-2.20070430/fence/agents/egenera/Makefile	2007-05-01 10:17:27.000000000 +0200
@@ -13,18 +13,17 @@
 
 include ../../../make/defines.mk
 
-SOURCE= fence_egenera.pl
 TARGET= fence_egenera
 
 all: $(TARGET)
 
-fence_egenera: fence_egenera.pl
+$(TARGET): $(TARGET).pl
 	: > $(TARGET)
-	awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(SOURCE) >> $(TARGET)
+	awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(TARGET).pl >> $(TARGET)
 	echo "\$$FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(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}" $(SOURCE) >> $(TARGET)
+	awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(TARGET).pl >> $(TARGET)
 	chmod +x $(TARGET)
 
 install: all
diff -urNad redhat-cluster-suite-2.20070430~/fence/agents/ibmblade/Makefile redhat-cluster-suite-2.20070430/fence/agents/ibmblade/Makefile
--- redhat-cluster-suite-2.20070430~/fence/agents/ibmblade/Makefile	2006-08-11 17:18:07.000000000 +0200
+++ redhat-cluster-suite-2.20070430/fence/agents/ibmblade/Makefile	2007-05-01 10:17:27.000000000 +0200
@@ -11,21 +11,19 @@
 ###############################################################################
 ###############################################################################
 
-SOURCE= fence_ibmblade.pl
-TARGET= fence_ibmblade
+include ../../../make/defines.mk
 
-top_srcdir=../..
-include ${top_srcdir}/make/defines.mk
+TARGET= fence_ibmblade
 
 all: $(TARGET)
 
-$(TARGET): $(SOURCE)
+$(TARGET): $(TARGET).pl
 	: > $(TARGET)
-	awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(SOURCE) >> $(TARGET)
+	awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(TARGET).pl >> $(TARGET)
 	echo "\$$FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(TARGET)
-	${top_srcdir}/scripts/define2var ${top_srcdir}/config/copyright.cf perl REDHAT_COPYRIGHT >> $(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}" $(SOURCE) >> $(TARGET)
+	awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(TARGET).pl >> $(TARGET)
 	chmod +x $(TARGET)
 
 install: all
@@ -34,7 +32,8 @@
 	fi
 	install -m755 ${TARGET} ${sbindir}
 
+uninstall:
+	${UNINSTALL} ${TARGET} ${sbindir}
+
 clean:
 	rm -f $(TARGET)
-
-
diff -urNad redhat-cluster-suite-2.20070430~/fence/agents/ilo/Makefile redhat-cluster-suite-2.20070430/fence/agents/ilo/Makefile
--- redhat-cluster-suite-2.20070430~/fence/agents/ilo/Makefile	2007-04-30 13:31:48.000000000 +0200
+++ redhat-cluster-suite-2.20070430/fence/agents/ilo/Makefile	2007-05-01 10:17:27.000000000 +0200
@@ -13,18 +13,17 @@
 
 include ../../../make/defines.mk
 
-SOURCE= fence_ilo.pl
 TARGET= fence_ilo
 
 all: $(TARGET)
 
-fence_ilo: $(SOURCE)
+$(TARGET): $(TARGET).pl
 	: > $(TARGET)
-	awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(SOURCE) >> $(TARGET)
+	awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(TARGET).pl >> $(TARGET)
 	echo "\$$FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(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}" $(SOURCE) >> $(TARGET)
+	awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(TARGET).pl >> $(TARGET)
 	chmod +x $(TARGET)
 
 install: all
diff -urNad redhat-cluster-suite-2.20070430~/fence/agents/mcdata/Makefile redhat-cluster-suite-2.20070430/fence/agents/mcdata/Makefile
--- redhat-cluster-suite-2.20070430~/fence/agents/mcdata/Makefile	2007-04-30 13:31:48.000000000 +0200
+++ redhat-cluster-suite-2.20070430/fence/agents/mcdata/Makefile	2007-05-01 10:17:27.000000000 +0200
@@ -13,18 +13,17 @@
 
 include ../../../make/defines.mk
 
-SOURCE= fence_mcdata.pl
 TARGET= fence_mcdata
 
 all: $(TARGET)
 
-$(TARGET): $(SOURCE)
+$(TARGET): $(TARGET).pl
 	: > $(TARGET)
-	awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(SOURCE) >> $(TARGET)
+	awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(TARGET).pl >> $(TARGET)
 	echo "\$$FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(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}" $(SOURCE) >> $(TARGET)
+	awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(TARGET).pl >> $(TARGET)
 	chmod +x $(TARGET)
 
 install: all
diff -urNad redhat-cluster-suite-2.20070430~/fence/agents/rackswitch/Makefile redhat-cluster-suite-2.20070430/fence/agents/rackswitch/Makefile
--- redhat-cluster-suite-2.20070430~/fence/agents/rackswitch/Makefile	2006-08-11 17:18:08.000000000 +0200
+++ redhat-cluster-suite-2.20070430/fence/agents/rackswitch/Makefile	2007-05-01 10:17:27.000000000 +0200
@@ -11,25 +11,23 @@
 ###############################################################################
 ###############################################################################
 
-TARGET= fence_rackswitch
-
-SOURCE= do_rack.c
-
-top_srcdir=../..
-
-ccs_libdir=${top_srcdir}/ccs/lib
+include ../../../make/defines.mk
 
-INCLUDE= -I${top_srcdir}/include -I${top_srcdir}/config
+TARGET= fence_rackswitch
 
+OBJS=	do_rack.o
 
-include ${top_srcdir}/make/defines.mk
+CFLAGS += -DFENCE_RELEASE_NAME=\"${RELEASE}\"
 
-CFLAGS+= -DFENCE_RELEASE_NAME=\"${RELEASE}\"
+# INCLUDE= -I${top_srcdir}/include -I${top_srcdir}/config
 
 all: ${TARGET}
 
-fence_rackswitch: ${SOURCE:.c=.o}
-	${CC} ${CFLAGS} ${LDFLAGS} ${SOURCE:.c=.o} ${LOADLIBES} ${LDLIBS} -o $@
+${TARGET}: ${OBJS}
+	$(CC) -o $@ $^ $(LDFLAGS)
+
+%.o: %.c
+	$(CC) $(CFLAGS) -c -o $@ $^
 
 install: all
 	if [ ! -d ${sbindir} ]; then \
@@ -37,6 +35,9 @@
 	fi
 	install -m755 ${TARGET} ${sbindir}
 
+uninstall:
+	${UNINSTALL} ${TARGET} ${sbindir}
+
 clean:
 	rm -f *.o ${TARGET} *~
 
diff -urNad redhat-cluster-suite-2.20070430~/fence/agents/rsa/Makefile redhat-cluster-suite-2.20070430/fence/agents/rsa/Makefile
--- redhat-cluster-suite-2.20070430~/fence/agents/rsa/Makefile	2007-04-30 13:31:48.000000000 +0200
+++ redhat-cluster-suite-2.20070430/fence/agents/rsa/Makefile	2007-05-01 10:17:27.000000000 +0200
@@ -13,18 +13,17 @@
 
 include ../../../make/defines.mk
 
-SOURCE= fence_rsa.py
 TARGET= fence_rsa
 
 all: $(TARGET)
 
-fence_rsa: fence_rsa.py
+$(TARGET): $(TARGET).py
 	: > $(TARGET)
-	awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(SOURCE) >> $(TARGET)
+	awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(TARGET).py >> $(TARGET)
 	echo "FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(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}" $(SOURCE) >> $(TARGET)
+	awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(TARGET).py >> $(TARGET)
 	chmod +x $(TARGET)
 
 install: all
diff -urNad redhat-cluster-suite-2.20070430~/fence/agents/rsb/Makefile redhat-cluster-suite-2.20070430/fence/agents/rsb/Makefile
--- redhat-cluster-suite-2.20070430~/fence/agents/rsb/Makefile	2007-04-30 13:31:48.000000000 +0200
+++ redhat-cluster-suite-2.20070430/fence/agents/rsb/Makefile	2007-05-01 10:17:27.000000000 +0200
@@ -13,18 +13,17 @@
 
 include ../../../make/defines.mk
 
-SOURCE= fence_rsb.py
 TARGET= fence_rsb
 
 all: $(TARGET)
 
-fence_rsb: fence_rsb.py
+$(TARGET): $(TARGET).py
 	: > $(TARGET)
-	awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(SOURCE) >> $(TARGET)
+	awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(TARGET).py >> $(TARGET)
 	echo "FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(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}" $(SOURCE) >> $(TARGET)
+	awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(TARGET).py >> $(TARGET)
 	chmod +x $(TARGET)
 
 install: all
diff -urNad redhat-cluster-suite-2.20070430~/fence/agents/sanbox2/Makefile redhat-cluster-suite-2.20070430/fence/agents/sanbox2/Makefile
--- redhat-cluster-suite-2.20070430~/fence/agents/sanbox2/Makefile	2007-04-30 13:31:48.000000000 +0200
+++ redhat-cluster-suite-2.20070430/fence/agents/sanbox2/Makefile	2007-05-01 10:17:27.000000000 +0200
@@ -13,18 +13,17 @@
 
 include ../../../make/defines.mk
 
-SOURCE= fence_sanbox2.pl
 TARGET= fence_sanbox2
 
 all: $(TARGET)
 
-$(TARGET): $(SOURCE)
+$(TARGET): $(TARGET).pl
 	: > $(TARGET)
-	awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(SOURCE) >> $(TARGET)
+	awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(TARGET).pl >> $(TARGET)
 	echo "\$$FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(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}" $(SOURCE) >> $(TARGET)
+	awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(TARGET).pl >> $(TARGET)
 	chmod +x $(TARGET)
 
 install: all
diff -urNad redhat-cluster-suite-2.20070430~/fence/agents/scsi/Makefile redhat-cluster-suite-2.20070430/fence/agents/scsi/Makefile
--- redhat-cluster-suite-2.20070430~/fence/agents/scsi/Makefile	2007-04-30 13:31:48.000000000 +0200
+++ redhat-cluster-suite-2.20070430/fence/agents/scsi/Makefile	2007-05-01 10:17:27.000000000 +0200
@@ -12,39 +12,34 @@
 
 include ../../../make/defines.mk
 
-SOURCE= fence_scsi.pl
 TARGET= fence_scsi
 SCRIPT= scsi_reserve
 
-TEST_SOURCE= fence_scsi_test.pl
-TEST_TARGET= fence_scsi_test
-
-all: $(TARGET) $(TEST_TARGET)
+all: $(TARGET) $(TARGET)_test
 
-fence_scsi: fence_scsi.pl
+$(TARGET): $(TARGET).pl
 	: > $(TARGET)
-	awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(SOURCE) >> $(TARGET)
+	awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(TARGET).pl >> $(TARGET)
 	echo "\$$FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(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}" $(SOURCE) >> $(TARGET)
+	awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(TARGET).pl >> $(TARGET)
 	chmod +x $(TARGET)
 
-fence_scsi_test: fence_scsi_test.pl
-	: > $(TEST_TARGET)
-	awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(TEST_SOURCE) >> $(TEST_TARGET)
-	echo "\$$FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(TEST_TARGET)
-	${DEF2VAR} ${BUILDDIR}/config/copyright.cf perl REDHAT_COPYRIGHT >> $(TEST_TARGET)
-	echo "\$$BUILD_DATE=\"(built `date`)\";" >> $(TEST_TARGET)
-	awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(TEST_SOURCE) >> $(TEST_TARGET)
-	chmod +x $(TEST_TARGET)
+$(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
+	${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
+	chmod +x $(TARGET)_test
 
 install: all
 	if [ ! -d ${sbindir} ]; then \
 		install -d ${sbindir}; \
 	fi
-	install -m755 ${TARGET} ${sbindir}
-	install -m755 ${TEST_TARGET} ${sbindir}
+	install -m755 ${TARGET} ${TARGET}_test ${sbindir}
 	if [ ! -d ${DESTDIR}/etc/init.d ]; then \
 		install -d ${DESTDIR}/etc/init.d; \
 	fi
@@ -55,4 +50,4 @@
 	${UNINSTALL} ${SCRIPT} ${DESTDIR}/etc/init.d
 
 clean:
-	rm -f $(TARGET) $(TEST_TARGET)
+	rm -f $(TARGET) $(TARGET)_test
diff -urNad redhat-cluster-suite-2.20070430~/fence/agents/vixel/Makefile redhat-cluster-suite-2.20070430/fence/agents/vixel/Makefile
--- redhat-cluster-suite-2.20070430~/fence/agents/vixel/Makefile	2007-04-30 13:31:48.000000000 +0200
+++ redhat-cluster-suite-2.20070430/fence/agents/vixel/Makefile	2007-05-01 10:17:27.000000000 +0200
@@ -13,18 +13,17 @@
 
 include ../../../make/defines.mk
 
-SOURCE= fence_vixel.pl
 TARGET= fence_vixel
 
 all: $(TARGET)
 
-$(TARGET): $(SOURCE)
+$(TARGET): $(TARGET).pl
 	: > $(TARGET)
-	awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(SOURCE) >> $(TARGET)
+	awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(TARGET).pl >> $(TARGET)
 	echo "\$$FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(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}" $(SOURCE) >> $(TARGET)
+	awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(TARGET).pl >> $(TARGET)
 	chmod +x $(TARGET)
 
 install: all
diff -urNad redhat-cluster-suite-2.20070430~/fence/agents/vmware/Makefile redhat-cluster-suite-2.20070430/fence/agents/vmware/Makefile
--- redhat-cluster-suite-2.20070430~/fence/agents/vmware/Makefile	2006-08-11 17:18:09.000000000 +0200
+++ redhat-cluster-suite-2.20070430/fence/agents/vmware/Makefile	2007-05-01 10:17:27.000000000 +0200
@@ -11,21 +11,19 @@
 ###############################################################################
 ###############################################################################
 
-SOURCE= fence_vmware.pl
-TARGET= fence_vmware
+include ../../../make/defines.mk
 
-top_srcdir=../..
-include ${top_srcdir}/make/defines.mk
+TARGET= fence_vmware
 
 all: $(TARGET)
 
-$(TARGET): $(SOURCE)
+$(TARGET): $(TARGET).pl
 	: > $(TARGET)
-	awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(SOURCE) >> $(TARGET)
+	awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(TARGET).pl >> $(TARGET)
 	echo "\$$FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(TARGET)
-	${top_srcdir}/scripts/define2var ${top_srcdir}/config/copyright.cf perl REDHAT_COPYRIGHT >> $(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}" $(SOURCE) >> $(TARGET)
+	awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(TARGET).pl >> $(TARGET)
 	chmod +x $(TARGET)
 
 install: all
@@ -34,6 +32,10 @@
 	fi
 	install -m755 ${TARGET} ${sbindir}
 
+uninstall:
+	${UNINSTALL} ${TARGET} ${sbindir}
+
 clean:
 	rm -f $(TARGET)
 
+
diff -urNad redhat-cluster-suite-2.20070430~/fence/agents/wti/Makefile redhat-cluster-suite-2.20070430/fence/agents/wti/Makefile
--- redhat-cluster-suite-2.20070430~/fence/agents/wti/Makefile	2007-04-30 13:31:48.000000000 +0200
+++ redhat-cluster-suite-2.20070430/fence/agents/wti/Makefile	2007-05-01 10:17:27.000000000 +0200
@@ -13,18 +13,17 @@
 
 include ../../../make/defines.mk
 
-SOURCE= fence_wti.pl
 TARGET= fence_wti
 
 all: $(TARGET)
 
-$(TARGET): $(SOURCE)
+$(TARGET): $(TARGET).pl
 	: > $(TARGET)
-	awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(SOURCE) >> $(TARGET)
+	awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(TARGET).pl >> $(TARGET)
 	echo "\$$FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(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}" $(SOURCE) >> $(TARGET)
+	awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(TARGET).pl >> $(TARGET)
 	chmod +x $(TARGET)
 
 install: all
diff -urNad redhat-cluster-suite-2.20070430~/fence/agents/xcat/Makefile redhat-cluster-suite-2.20070430/fence/agents/xcat/Makefile
--- redhat-cluster-suite-2.20070430~/fence/agents/xcat/Makefile	2006-08-11 17:18:09.000000000 +0200
+++ redhat-cluster-suite-2.20070430/fence/agents/xcat/Makefile	2007-05-01 10:17:27.000000000 +0200
@@ -1,26 +1,29 @@
 ###############################################################################
 ###############################################################################
 ##
-##  Copyright (C) Sistina Software, Inc.  1997-2002  All rights reserved.
+##  Copyright (C) Sistina Software, Inc.  1997-2003  All rights reserved.
+##  Copyright (C) 2004 Red Hat, Inc.  All rights reserved.
+##  
+##  This copyrighted material is made available to anyone wishing to use,
+##  modify, copy, or redistribute it subject to the terms and conditions
+##  of the GNU General Public License v.2.
 ##
 ###############################################################################
 ###############################################################################
 
-SOURCE= fence_xcat.pl
-TARGET= fence_xcat
+include ../../../make/defines.mk
 
-top_srcdir=../..
-include ${top_srcdir}/make/defines.mk
+TARGET= fence_xcat
 
 all: $(TARGET)
 
-$(TARGET): $(SOURCE)
+$(TARGET): $(TARGET).pl
 	: > $(TARGET)
-	awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(SOURCE) >> $(TARGET)
+	awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(TARGET).pl >> $(TARGET)
 	echo "\$$FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(TARGET)
-	${top_srcdir}/scripts/define2var ${top_srcdir}/config/copyright.cf perl REDHAT_COPYRIGHT >> $(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}" $(SOURCE) >> $(TARGET)
+	awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(TARGET).pl >> $(TARGET)
 	chmod +x $(TARGET)
 
 install: all
@@ -29,6 +32,9 @@
 	fi
 	install -m755 ${TARGET} ${sbindir}
 
+uninstall:
+	${UNINSTALL} ${TARGET} ${sbindir}
+
 clean:
 	rm -f $(TARGET)
 
diff -urNad redhat-cluster-suite-2.20070430~/fence/agents/xen/Makefile redhat-cluster-suite-2.20070430/fence/agents/xen/Makefile
--- redhat-cluster-suite-2.20070430~/fence/agents/xen/Makefile	2006-08-11 17:18:09.000000000 +0200
+++ redhat-cluster-suite-2.20070430/fence/agents/xen/Makefile	2007-05-01 10:17:27.000000000 +0200
@@ -11,21 +11,19 @@
 ###############################################################################
 ###############################################################################
 
-SOURCE= fence_xen.pl
-TARGET= fence_xen
+include ../../../make/defines.mk
 
-top_srcdir=../..
-include ${top_srcdir}/make/defines.mk
+TARGET= fence_xen
 
 all: $(TARGET)
 
-$(TARGET): $(SOURCE)
+$(TARGET): $(TARGET).pl
 	: > $(TARGET)
-	awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(SOURCE) >> $(TARGET)
+	awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(TARGET).pl >> $(TARGET)
 	echo "\$$FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(TARGET)
-	${top_srcdir}/scripts/define2var ${top_srcdir}/config/copyright.cf perl REDHAT_COPYRIGHT >> $(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}" $(SOURCE) >> $(TARGET)
+	awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(TARGET).pl >> $(TARGET)
 	chmod +x $(TARGET)
 
 install: all
@@ -34,6 +32,10 @@
 	fi
 	install -m755 ${TARGET} ${sbindir}
 
+uninstall:
+	${UNINSTALL} ${TARGET} ${sbindir}
+
 clean:
 	rm -f $(TARGET)
 
+
diff -urNad redhat-cluster-suite-2.20070430~/fence/agents/zvm/Makefile redhat-cluster-suite-2.20070430/fence/agents/zvm/Makefile
--- redhat-cluster-suite-2.20070430~/fence/agents/zvm/Makefile	2006-08-11 17:18:09.000000000 +0200
+++ redhat-cluster-suite-2.20070430/fence/agents/zvm/Makefile	2007-05-01 10:17:27.000000000 +0200
@@ -11,21 +11,19 @@
 ###############################################################################
 ###############################################################################
 
-SOURCE= fence_zvm.pl
-TARGET= fence_zvm
+include ../../../make/defines.mk
 
-top_srcdir=../..
-include ${top_srcdir}/make/defines.mk
+TARGET= fence_zvm
 
 all: $(TARGET)
 
-$(TARGET): $(SOURCE)
+$(TARGET): $(TARGET).pl
 	: > $(TARGET)
-	awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(SOURCE) >> $(TARGET)
+	awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(TARGET).pl >> $(TARGET)
 	echo "\$$FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(TARGET)
-	${top_srcdir}/scripts/define2var ${top_srcdir}/config/copyright.cf perl REDHAT_COPYRIGHT >> $(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}" $(SOURCE) >> $(TARGET)
+	awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(TARGET).pl >> $(TARGET)
 	chmod +x $(TARGET)
 
 install: all
@@ -34,6 +32,9 @@
 	fi
 	install -m755 ${TARGET} ${sbindir}
 
+uninstall:
+	${UNINSTALL} ${TARGET} ${sbindir}
+
 clean:
 	rm -f $(TARGET)
 
diff -urNad redhat-cluster-suite-2.20070430~/make/defines.mk.input redhat-cluster-suite-2.20070430/make/defines.mk.input
--- redhat-cluster-suite-2.20070430~/make/defines.mk.input	2007-04-30 13:22:21.000000000 +0200
+++ redhat-cluster-suite-2.20070430/make/defines.mk.input	2007-05-01 10:17:27.000000000 +0200
@@ -59,6 +59,7 @@
 xenlibdir ?= @XENLIBDIR@
 virtincdir ?= @VIRTINCDIR@
 virtlibdir ?= @VIRTLIBDIR@
+fence_agents ?= @FENCE_AGENTS@
 enable_xen ?= @ENABLE_XEN@
 
 UNINSTALL = @BUILDDIR@/scripts/uninstall.pl