diff -Naurd redhat-cluster-suite-2.20070823/fence/agents/apc/Makefile cluster/fence/agents/apc/Makefile
--- redhat-cluster-suite-2.20070823/fence/agents/apc/Makefile	2007-08-23 06:48:19.000000000 +0200
+++ cluster/fence/agents/apc/Makefile	2007-08-29 05:55:40.000000000 +0200
@@ -15,25 +15,4 @@
 
 TARGET= fence_apc
 
-all: $(TARGET)
-
-$(TARGET): $(TARGET).py
-	: > $(TARGET)
-	awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(TARGET).py >> $(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)
-	chmod +x $(TARGET)
-
-install: all
-	if [ ! -d ${sbindir} ]; then \
-		install -d ${sbindir}; \
-	fi
-	install -m755 ${TARGET} ${sbindir}
-
-uninstall:
-	${UNINSTALL} ${TARGET} ${sbindir}
-
-clean:
-	rm -f $(TARGET)
+include ../../../make/fencepy.mk
diff -Naurd redhat-cluster-suite-2.20070823/fence/agents/rsa/Makefile cluster/fence/agents/rsa/Makefile
--- redhat-cluster-suite-2.20070823/fence/agents/rsa/Makefile	2007-08-23 06:48:20.000000000 +0200
+++ cluster/fence/agents/rsa/Makefile	2007-08-29 05:54:52.000000000 +0200
@@ -15,25 +15,4 @@
 
 TARGET= fence_rsa
 
-all: $(TARGET)
-
-$(TARGET): $(TARGET).py
-	: > $(TARGET)
-	awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(TARGET).py >> $(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)
-	chmod +x $(TARGET)
-
-install: all
-	if [ ! -d ${sbindir} ]; then \
-		install -d ${sbindir}; \
-	fi
-	install -m755 ${TARGET} ${sbindir}
-
-uninstall:
-	${UNINSTALL} ${TARGET} ${sbindir}
-
-clean:
-	rm -f $(TARGET)
+include ../../../make/fencepy.mk
diff -Naurd redhat-cluster-suite-2.20070823/fence/agents/rsb/Makefile cluster/fence/agents/rsb/Makefile
--- redhat-cluster-suite-2.20070823/fence/agents/rsb/Makefile	2007-08-23 06:48:20.000000000 +0200
+++ cluster/fence/agents/rsb/Makefile	2007-08-29 05:55:14.000000000 +0200
@@ -15,25 +15,4 @@
 
 TARGET= fence_rsb
 
-all: $(TARGET)
-
-$(TARGET): $(TARGET).py
-	: > $(TARGET)
-	awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(TARGET).py >> $(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)
-	chmod +x $(TARGET)
-
-install: all
-	if [ ! -d ${sbindir} ]; then \
-		install -d ${sbindir}; \
-	fi
-	install -m755 ${TARGET} ${sbindir}
-
-uninstall:
-	${UNINSTALL} ${TARGET} ${sbindir}
-
-clean:
-	rm -f $(TARGET)
+include ../../../make/fencepy.mk
diff -Naurd redhat-cluster-suite-2.20070823/make/fencepy.mk cluster/make/fencepy.mk
--- redhat-cluster-suite-2.20070823/make/fencepy.mk	1970-01-01 01:00:00.000000000 +0100
+++ cluster/make/fencepy.mk	2007-08-29 05:53:20.000000000 +0200
@@ -0,0 +1,22 @@
+all: $(TARGET)
+
+$(TARGET):
+	: > $(TARGET)
+	awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(TARGET).py >> $(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)
+	chmod +x $(TARGET)
+
+install: all
+	if [ ! -d ${sbindir} ]; then \
+		install -d ${sbindir}; \
+	fi
+	install -m755 ${TARGET} ${sbindir}
+
+uninstall:
+	${UNINSTALL} ${TARGET} ${sbindir}
+
+clean:
+	rm -f $(TARGET)
