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

[Cluster-devel] cluster ccs/ccs_test/Makefile ccs/ccs_tool/Mak ...



CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	fabbione sourceware org	2007-12-22 12:46:31

Modified files:
	ccs/ccs_test   : Makefile 
	ccs/ccs_tool   : Makefile 
	ccs/daemon     : Makefile 
	ccs/lib        : Makefile 
	cman/cman_tool : Makefile 
	cman/daemon    : Makefile 
	cman/init.d    : Makefile 
	cman/lib       : Makefile 
	cman/qdisk     : Makefile 
	dlm/lib        : Makefile 
	dlm/tool       : Makefile 
	fence/agents/ipmilan: Makefile 
	fence/agents/manual: Makefile 
	fence/agents/rackswitch: Makefile 
	fence/agents/rps10: Makefile 
	fence/agents/scsi: Makefile 
	fence/agents/xvm: Makefile 
	fence/fence_node: Makefile 
	fence/fence_tool: Makefile 
	fence/fenced   : Makefile 
	gfs/gfs_debug  : Makefile 
	gfs/gfs_edit   : Makefile 
	gfs/gfs_fsck   : Makefile 
	gfs/gfs_grow   : Makefile 
	gfs/gfs_jadd   : Makefile 
	gfs/gfs_mkfs   : Makefile 
	gfs/gfs_quota  : Makefile 
	gfs/gfs_tool   : Makefile 
	gfs/init.d     : Makefile 
	gfs/libgfs     : Makefile 
	gfs-kernel/src/gfs: Makefile 
	gfs2/convert   : Makefile 
	gfs2/edit      : Makefile 
	gfs2/fsck      : Makefile 
	gfs2/init.d    : Makefile 
	gfs2/libgfs2   : Makefile 
	gfs2/mkfs      : Makefile 
	gfs2/quota     : Makefile 
	gfs2/tool      : Makefile 
	gnbd/client    : Makefile 
	gnbd/server    : Makefile 
	gnbd/tools/fence_gnbd: Makefile 
	gnbd/tools/gnbd_export: Makefile 
	gnbd/tools/gnbd_import: Makefile 
	gnbd/utils     : Makefile 
	gnbd-kernel/src: Makefile 
	group/daemon   : Makefile 
	group/dlm_controld: Makefile 
	group/gfs_controld: Makefile 
	group/lib      : Makefile 
	group/tool     : Makefile 
	make           : fenceperl.mk fencepy.mk 
	rgmanager/init.d: Makefile 
	rgmanager/src/clulib: Makefile 
	rgmanager/src/daemons: Makefile 
	rgmanager/src/resources: Makefile 
	rgmanager/src/utils: Makefile 
Added files:
	make           : install.mk uninstall.mk 

Log message:
	Collapse all install: and uninstall: targets in make/install.mk make/uninstall.mk
	
	Change almost all Makefile's to use them.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/ccs_test/Makefile.diff?cvsroot=cluster&r1=1.12&r2=1.13
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/ccs_tool/Makefile.diff?cvsroot=cluster&r1=1.18&r2=1.19
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/daemon/Makefile.diff?cvsroot=cluster&r1=1.20&r2=1.21
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/lib/Makefile.diff?cvsroot=cluster&r1=1.12&r2=1.13
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/cman_tool/Makefile.diff?cvsroot=cluster&r1=1.28&r2=1.29
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/daemon/Makefile.diff?cvsroot=cluster&r1=1.59&r2=1.60
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/init.d/Makefile.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/lib/Makefile.diff?cvsroot=cluster&r1=1.14&r2=1.15
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/qdisk/Makefile.diff?cvsroot=cluster&r1=1.16&r2=1.17
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/dlm/lib/Makefile.diff?cvsroot=cluster&r1=1.25&r2=1.26
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/dlm/tool/Makefile.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/ipmilan/Makefile.diff?cvsroot=cluster&r1=1.11&r2=1.12
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/manual/Makefile.diff?cvsroot=cluster&r1=1.13&r2=1.14
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/rackswitch/Makefile.diff?cvsroot=cluster&r1=1.9&r2=1.10
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/rps10/Makefile.diff?cvsroot=cluster&r1=1.9&r2=1.10
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/scsi/Makefile.diff?cvsroot=cluster&r1=1.16&r2=1.17
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/xvm/Makefile.diff?cvsroot=cluster&r1=1.18&r2=1.19
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/fence_node/Makefile.diff?cvsroot=cluster&r1=1.13&r2=1.14
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/fence_tool/Makefile.diff?cvsroot=cluster&r1=1.20&r2=1.21
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/fenced/Makefile.diff?cvsroot=cluster&r1=1.16&r2=1.17
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_debug/Makefile.diff?cvsroot=cluster&r1=1.13&r2=1.14
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_edit/Makefile.diff?cvsroot=cluster&r1=1.13&r2=1.14
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_fsck/Makefile.diff?cvsroot=cluster&r1=1.16&r2=1.17
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_grow/Makefile.diff?cvsroot=cluster&r1=1.14&r2=1.15
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_jadd/Makefile.diff?cvsroot=cluster&r1=1.14&r2=1.15
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_mkfs/Makefile.diff?cvsroot=cluster&r1=1.15&r2=1.16
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_quota/Makefile.diff?cvsroot=cluster&r1=1.14&r2=1.15
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_tool/Makefile.diff?cvsroot=cluster&r1=1.18&r2=1.19
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/init.d/Makefile.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/libgfs/Makefile.diff?cvsroot=cluster&r1=1.14&r2=1.15
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/gfs/Makefile.diff?cvsroot=cluster&r1=1.20&r2=1.21
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/convert/Makefile.diff?cvsroot=cluster&r1=1.15&r2=1.16
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/edit/Makefile.diff?cvsroot=cluster&r1=1.15&r2=1.16
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/fsck/Makefile.diff?cvsroot=cluster&r1=1.19&r2=1.20
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/init.d/Makefile.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/libgfs2/Makefile.diff?cvsroot=cluster&r1=1.16&r2=1.17
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/mkfs/Makefile.diff?cvsroot=cluster&r1=1.24&r2=1.25
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/quota/Makefile.diff?cvsroot=cluster&r1=1.16&r2=1.17
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/tool/Makefile.diff?cvsroot=cluster&r1=1.18&r2=1.19
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/client/Makefile.diff?cvsroot=cluster&r1=1.18&r2=1.19
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/server/Makefile.diff?cvsroot=cluster&r1=1.18&r2=1.19
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/tools/fence_gnbd/Makefile.diff?cvsroot=cluster&r1=1.9&r2=1.10
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/tools/gnbd_export/Makefile.diff?cvsroot=cluster&r1=1.19&r2=1.20
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/tools/gnbd_import/Makefile.diff?cvsroot=cluster&r1=1.16&r2=1.17
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/utils/Makefile.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd-kernel/src/Makefile.diff?cvsroot=cluster&r1=1.10&r2=1.11
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/daemon/Makefile.diff?cvsroot=cluster&r1=1.25&r2=1.26
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/dlm_controld/Makefile.diff?cvsroot=cluster&r1=1.15&r2=1.16
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/gfs_controld/Makefile.diff?cvsroot=cluster&r1=1.17&r2=1.18
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/lib/Makefile.diff?cvsroot=cluster&r1=1.11&r2=1.12
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/tool/Makefile.diff?cvsroot=cluster&r1=1.14&r2=1.15
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/make/install.mk.diff?cvsroot=cluster&r1=NONE&r2=1.1
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/make/uninstall.mk.diff?cvsroot=cluster&r1=NONE&r2=1.1
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/make/fenceperl.mk.diff?cvsroot=cluster&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/make/fencepy.mk.diff?cvsroot=cluster&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/init.d/Makefile.diff?cvsroot=cluster&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/clulib/Makefile.diff?cvsroot=cluster&r1=1.22&r2=1.23
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/daemons/Makefile.diff?cvsroot=cluster&r1=1.29&r2=1.30
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/resources/Makefile.diff?cvsroot=cluster&r1=1.22&r2=1.23
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/utils/Makefile.diff?cvsroot=cluster&r1=1.22&r2=1.23

--- cluster/ccs/ccs_test/Makefile	2007/12/21 20:13:43	1.12
+++ cluster/ccs/ccs_test/Makefile	2007/12/22 12:46:24	1.13
@@ -12,9 +12,13 @@
 
 TARGET= ccs_test
 
+SBINDIRT=$(TARGET)
+
 include ../../make/defines.mk
 include $(OBJDIR)/make/cobj.mk
 include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
 
 OBJS=	ccs_test.o
 
@@ -32,13 +36,6 @@
 depends:
 	$(MAKE) -C ../lib all
 
-install: all
-	install -d ${sbindir}
-	install ${TARGET} ${sbindir}
-
-uninstall:
-	${UNINSTALL} ${TARGET} ${sbindir}
-
 clean: generalclean
 
 .PHONY: all ${TARGET}
--- cluster/ccs/ccs_tool/Makefile	2007/12/21 20:13:43	1.18
+++ cluster/ccs/ccs_tool/Makefile	2007/12/22 12:46:24	1.19
@@ -12,9 +12,13 @@
 
 TARGET= ccs_tool
 
+SBINDIRT=$(TARGET)
+
 include ../../make/defines.mk
 include $(OBJDIR)/make/cobj.mk
 include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
 
 OBJS=	ccs_tool.o \
 	update.o \
@@ -38,13 +42,6 @@
 depends:
 	$(MAKE) -C ../lib all
 
-install: all
-	install -d ${sbindir}
-	install ccs_tool ${sbindir}
-
-uninstall:
-	${UNINSTALL} ccs_tool ${sbindir}
-
 clean: generalclean
 
 .PHONY: all ${TARGET}
--- cluster/ccs/daemon/Makefile	2007/12/21 20:13:43	1.20
+++ cluster/ccs/daemon/Makefile	2007/12/22 12:46:24	1.21
@@ -12,9 +12,13 @@
 
 TARGET= ccsd
 
+SBINDIRT=$(TARGET)
+
 include ../../make/defines.mk
 include $(OBJDIR)/make/cobj.mk
 include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
 
 OBJS=	ccsd.o \
 	cnx_mgr.o \
@@ -38,13 +42,6 @@
 depends:
 	 $(MAKE) -C ../lib all
 
-install: all
-	install -d ${sbindir}
-	install ${TARGET} ${sbindir}
-
-uninstall:
-	${UNINSTALL} ${TARGET} ${sbindir}
-
 clean: generalclean
 
 .PHONY: all ${TARGET}
--- cluster/ccs/lib/Makefile	2007/12/21 20:13:43	1.12
+++ cluster/ccs/lib/Makefile	2007/12/22 12:46:24	1.13
@@ -10,11 +10,16 @@
 ###############################################################################
 ###############################################################################
 
-TARGET=libccs.a
+TARGET= libccs.a
+
+LIBDIRT=$(TARGET)
+INCDIRT=ccs.h
 
 include ../../make/defines.mk
 include $(OBJDIR)/make/cobj.mk
 include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
 
 OBJS=	libccs.o \
 	log.o
@@ -33,15 +38,5 @@
 log.c:
 	ln -sf $(S)/../common/log.c log.c
 
-install: all
-	install -d ${libdir}
-	install -m644 ${TARGET} ${libdir}
-	install -d ${incdir}
-	install -m644 $(S)/ccs.h ${incdir}
-
-uninstall:
-	${UNINSTALL} ${TARGET} ${libdir} 
-	${UNINSTALL} ccs.h ${incdir} 
-
 clean: generalclean
 	rm -rf ccs.h.gch log.c
--- cluster/cman/cman_tool/Makefile	2007/12/21 20:13:43	1.28
+++ cluster/cman/cman_tool/Makefile	2007/12/22 12:46:24	1.29
@@ -12,9 +12,13 @@
 
 TARGET= cman_tool
 
+SBINDIRT=$(TARGET)
+
 include ../../make/defines.mk
 include $(OBJDIR)/make/cobj.mk
 include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
 
 OBJS=	main.o \
 	join.o
@@ -33,11 +37,4 @@
 depends:
 	$(MAKE) -C ../lib all
 
-install: all
-	install -d ${sbindir}
-	install ${TARGET} ${sbindir}
-
-uninstall:
-	${UNINSTALL} ${TARGET} ${sbindir}
-
 clean: generalclean
--- cluster/cman/daemon/Makefile	2007/12/21 20:13:43	1.59
+++ cluster/cman/daemon/Makefile	2007/12/22 12:46:24	1.60
@@ -12,9 +12,13 @@
 
 TARGET= service_cman.lcrso
 
+LCRSOT=$(TARGET)
+
 include ../../make/defines.mk
 include $(OBJDIR)/make/cobj.mk
 include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
 
 CFLAGS += -DOPENAIS_EXTERNAL_SERVICE
 CFLAGS += -fPIC
@@ -39,11 +43,4 @@
 depends:
 	$(MAKE) -C ../lib all
 
-install: all
-	install -d ${libexecdir}/lcrso
-	install ${TARGET} ${libexecdir}/lcrso
-
-uninstall:
-	rm -f ${libexecdir}/lcrso/${TARGET}
-
 clean: generalclean
--- cluster/cman/init.d/Makefile	2007/12/21 20:13:43	1.6
+++ cluster/cman/init.d/Makefile	2007/12/22 12:46:25	1.7
@@ -12,15 +12,12 @@
 
 TARGETS= cman qdiskd
 
+INITDT=$(TARGETS)
+
 include ../../make/defines.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
 
 all:
 
 clean:
-
-install:
-	install -d ${DESTDIR}/etc/init.d
-	install $(S)/cman $(S)/qdiskd ${DESTDIR}/etc/init.d
-
-uninstall:
-	${UNINSTALL} ${TARGETS} ${DESTDIR}/etc/init.d
--- cluster/cman/lib/Makefile	2007/12/21 20:13:44	1.14
+++ cluster/cman/lib/Makefile	2007/12/22 12:46:25	1.15
@@ -11,11 +11,21 @@
 ###############################################################################
 ###############################################################################
 
-TARGET=libcman
+TARGET= libcman
+
+LIBDIRT=$(TARGET).a \
+	$(TARGET).so.$(RELEASE_MAJOR).$(RELEASE_MINOR)
+
+LIBSYMT=$(TARGET).so \
+	$(TARGET).so.$(RELEASE_MAJOR)
+
+INCDIRT=$(TARGET).h
 
 include ../../make/defines.mk
 include $(OBJDIR)/make/cobj.mk
 include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
 
 SHAREDLIB=$(TARGET).so.${RELEASE_MAJOR}.${RELEASE_MINOR}
 STATICLIB=$(TARGET).a
@@ -35,21 +45,4 @@
 	ln -sf $(TARGET).so.$(RELEASE_MAJOR).$(RELEASE_MINOR) $(TARGET).so
 	ln -sf $(TARGET).so.$(RELEASE_MAJOR).$(RELEASE_MINOR) $(TARGET).so.$(RELEASE_MAJOR)
 
-install: all
-	install -d ${incdir}
-	install $(S)/$(TARGET).h ${incdir}
-	install -d ${libdir}
-	install $(TARGET).a ${libdir}
-	install $(TARGET).so.$(RELEASE_MAJOR).$(RELEASE_MINOR) ${libdir}
-	ln -sf $(TARGET).so.$(RELEASE_MAJOR).$(RELEASE_MINOR) ${libdir}/$(TARGET).so
-	ln -sf $(TARGET).so.$(RELEASE_MAJOR).$(RELEASE_MINOR) ${libdir}/$(TARGET).so.$(RELEASE_MAJOR)
-
-uninstall:
-	${UNINSTALL} $(TARGET).h ${incdir}
-	${UNINSTALL} \
-		${TARGET}.a \
-		$(TARGET).so \
-		$(TARGET).so.$(RELEASE_MAJOR) \
-		${TARGET}.so.$(RELEASE_MAJOR).$(RELEASE_MINOR) ${libdir}
-
 clean: generalclean
--- cluster/cman/qdisk/Makefile	2007/12/21 20:13:44	1.16
+++ cluster/cman/qdisk/Makefile	2007/12/22 12:46:25	1.17
@@ -13,9 +13,13 @@
 TARGET1= qdiskd
 TARGET2= mkqdisk
 
+SBINDIRT=${TARGET1} ${TARGET2}
+
 include ../../make/defines.mk
 include $(OBJDIR)/make/cobj.mk
 include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
 
 CFLAGS += -D_GNU_SOURCE
 CFLAGS += -Werror -Wstrict-prototypes -Wshadow
@@ -48,14 +52,7 @@
 ${TARGET2}: ${SHAREDOBJS} ${OBJS2}
 	$(CC) -o $@ $^ $(LDFLAGS)
 
-install: all
-	install -d ${sbindir}
-	install ${TARGET1} ${TARGET2} ${sbindir}
-
 depends:
 	$(MAKE) -C ../lib all
 
 clean: generalclean
-
-uninstall:
-	${UNINSTALL} ${TARGET1} ${TARGET2} ${sbindir}
--- cluster/dlm/lib/Makefile	2007/12/21 20:13:44	1.25
+++ cluster/dlm/lib/Makefile	2007/12/22 12:46:25	1.26
@@ -12,11 +12,28 @@
 ###############################################################################
 
 TARGET= libdlm
-AISTARGET= libaislock
+
+LIBDIRT=$(TARGET).a \
+	$(TARGET)_lt.a \
+	$(TARGET).so.${RELEASE_MAJOR}.${RELEASE_MINOR} \
+	$(TARGET)_lt.so.${RELEASE_MAJOR}.${RELEASE_MINOR}
+
+LIBSYMT=$(TARGET).so \
+	$(TARGET)_lt.so \
+	$(TARGET).so.$(RELEASE_MAJOR) \
+	$(TARGET)_lt.so.$(RELEASE_MAJOR)
+
+INCDIRT=$(TARGET).h
+
+UDEVT=../scripts/51-dlm.rules
 
 include ../../make/defines.mk
 include $(OBJDIR)/make/cobj.mk
 include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
+
+AISTARGET= libaislock
 
 SHAREDLIB=$(TARGET).so.${RELEASE_MAJOR}.${RELEASE_MINOR} $(TARGET)_lt.so.${RELEASE_MAJOR}.${RELEASE_MINOR}
 STATICLIB=$(TARGET).a $(TARGET)_lt.a
@@ -59,32 +76,4 @@
 %.po: $(S)/%.c
 	$(CC) $(CFLAGS) -fPIC -D_REENTRANT -c -o $@ $<
 
-install: all
-	install -d ${incdir}
-	install -m644 $(S)/$(TARGET).h ${incdir}
-	install -d ${libdir}
-	install -d ${DESTDIR}/etc/udev/rules.d
-	install -m644 $(S)/../scripts/51-dlm.rules ${DESTDIR}/etc/udev/rules.d
-	install $(TARGET).a ${libdir}
-	install $(TARGET)_lt.a ${libdir}
-	install $(TARGET).so.$(RELEASE_MAJOR).$(RELEASE_MINOR) ${libdir}
-	install $(TARGET)_lt.so.$(RELEASE_MAJOR).$(RELEASE_MINOR) ${libdir}
-	ln -sf $(TARGET).so.$(RELEASE_MAJOR).$(RELEASE_MINOR) ${libdir}/$(TARGET).so
-	ln -sf $(TARGET).so.$(RELEASE_MAJOR).$(RELEASE_MINOR) ${libdir}/$(TARGET).so.$(RELEASE_MAJOR)
-	ln -sf $(TARGET)_lt.so.$(RELEASE_MAJOR).$(RELEASE_MINOR) ${libdir}/$(TARGET)_lt.so
-	ln -sf $(TARGET)_lt.so.$(RELEASE_MAJOR).$(RELEASE_MINOR) ${libdir}/$(TARGET)_lt.so.$(RELEASE_MAJOR)
-
-uninstall:
-	${UNINSTALL} $(TARGET).h ${incdir}
-	${UNINSTALL} 51-dlm.rules ${DESTDIR}/etc/udev/rules.d
-	${UNINSTALL} \
-		${TARGET}.a \
-		${TARGET}_lt.a \
-		$(TARGET).so \
-		$(TARGET)_lt.so \
-		$(TARGET).so.$(RELEASE_MAJOR) \
-		${TARGET}.so.$(RELEASE_MAJOR).$(RELEASE_MINOR) \
-		$(TARGET)_lt.so.$(RELEASE_MAJOR) \
-		${TARGET}_lt.so.$(RELEASE_MAJOR).$(RELEASE_MINOR) ${libdir}
-
 clean: generalclean
--- cluster/dlm/tool/Makefile	2007/12/21 20:13:45	1.7
+++ cluster/dlm/tool/Makefile	2007/12/22 12:46:25	1.8
@@ -12,9 +12,13 @@
 
 TARGET= dlm_tool
 
+SBINDIRT=$(TARGET)
+
 include ../../make/defines.mk
 include $(OBJDIR)/make/cobj.mk
 include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
 
 OBJS=	main.o
 
@@ -30,10 +34,3 @@
 	$(CC) -o $@ $^ $(LDFLAGS)
 
 clean: generalclean
-
-install: all
-	install -d ${sbindir}
-	install ${TARGET} ${sbindir}
-
-uninstall:
-	${UNINSTALL} ${TARGET} ${sbindir}
--- cluster/fence/agents/ipmilan/Makefile	2007/12/21 20:13:46	1.11
+++ cluster/fence/agents/ipmilan/Makefile	2007/12/22 12:46:25	1.12
@@ -13,9 +13,13 @@
 
 TARGET= fence_ipmilan
 
+SBINDIRT=$(TARGET)
+
 include ../../../make/defines.mk
 include $(OBJDIR)/make/cobj.mk
 include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
 
 OBJS=	expect.o \
 	ipmilan.o
@@ -27,13 +31,4 @@
 ${TARGET}: ${OBJS}
 	$(CC) -o $@ $^ $(LDFLAGS)
 
-install: all
-	if [ ! -d ${sbindir} ]; then \
-		install -d ${sbindir}; \
-	fi
-	install -m755 ${TARGET} ${sbindir}
-
-uninstall:
-	${UNINSTALL} ${TARGET} ${sbindir}
-
 clean: generalclean
--- cluster/fence/agents/manual/Makefile	2007/12/21 20:13:46	1.13
+++ cluster/fence/agents/manual/Makefile	2007/12/22 12:46:25	1.14
@@ -13,24 +13,19 @@
 
 TARGET= fence_ack_manual
 
+SBINDIRT=$(TARGET)
+
 include ../../../make/defines.mk
 include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
 
 all: ${TARGET}
 
 # Using manual override instead of the binary version.
 # (this version does not require any configuration params
 # in cluster.conf, but fencing must fail first)
-fence_ack_manual: $(S)/fence_ack_manual.sh
-	cp $< $@
-
-install: all
-	if [ ! -d ${sbindir} ]; then \
-		install -d ${sbindir}; \
-	fi
-	install -m755 ${TARGET} ${sbindir}
-
-uninstall:
-	${UNINSTALL} ${TARGET} ${sbindir}
+${TARGET}: 
+	cp $(S)/$  sh $@
 
 clean: generalclean
--- cluster/fence/agents/rackswitch/Makefile	2007/12/21 20:13:46	1.9
+++ cluster/fence/agents/rackswitch/Makefile	2007/12/22 12:46:26	1.10
@@ -13,9 +13,13 @@
 
 TARGET= fence_rackswitch
 
+SBINDIRT=$(TARGET)
+
 include ../../../make/defines.mk
 include $(OBJDIR)/make/cobj.mk
 include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
 
 OBJS=	do_rack.o
 
@@ -26,13 +30,4 @@
 ${TARGET}: ${OBJS}
 	$(CC) -o $@ $^ $(LDFLAGS)
 
-install: all
-	if [ ! -d ${sbindir} ]; then \
-		install -d ${sbindir}; \
-	fi
-	install -m755 ${TARGET} ${sbindir}
-
-uninstall:
-	${UNINSTALL} ${TARGET} ${sbindir}
-
 clean: generalclean
--- cluster/fence/agents/rps10/Makefile	2007/12/21 20:13:47	1.9
+++ cluster/fence/agents/rps10/Makefile	2007/12/22 12:46:26	1.10
@@ -13,9 +13,13 @@
 
 TARGET= fence_rps10
 
+SBINDIRT=$(TARGET)
+
 include ../../../make/defines.mk
 include $(OBJDIR)/make/cobj.mk
 include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
 
 TARGET= fence_rps10
 
@@ -28,13 +32,4 @@
 ${TARGET}: ${OBJS}
 	$(CC) -o $@ $^ $(LDFLAGS)
 
-install: all
-	if [ ! -d ${sbindir} ]; then \
-		install -d ${sbindir}; \
-	fi
-	install -m755 ${TARGET} ${sbindir}
-
-uninstall:
-	${UNINSTALL} ${TARGET} ${sbindir}
-
 clean: generalclean
--- cluster/fence/agents/scsi/Makefile	2007/12/21 20:13:47	1.16
+++ cluster/fence/agents/scsi/Makefile	2007/12/22 12:46:26	1.17
@@ -11,10 +11,14 @@
 ###############################################################################
 
 TARGET= fence_scsi
-SCRIPT= scsi_reserve
+
+SBINDIRT=$(TARGET) $(TARGET)_test
+INITDT= scsi_reserve
 
 include ../../../make/defines.mk
 include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
 
 all: $(TARGET) $(TARGET)_test
 
@@ -36,18 +40,4 @@
 	awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(S)/$(TARGET)_test.pl >> $(TARGET)_test
 	chmod +x $(TARGET)_test
 
-install: all
-	if [ ! -d ${sbindir} ]; then \
-		install -d ${sbindir}; \
-	fi
-	install -m755 ${TARGET} ${TARGET}_test ${sbindir}
-	if [ ! -d ${DESTDIR}/etc/init.d ]; then \
-		install -d ${DESTDIR}/etc/init.d; \
-	fi
-	install -m755 $(S)/${SCRIPT} ${DESTDIR}/etc/init.d
-
-uninstall:
-	${UNINSTALL} ${TARGET} ${TARGET}_test ${sbindir}
-	${UNINSTALL} ${SCRIPT} ${DESTDIR}/etc/init.d
-
 clean: generalclean
--- cluster/fence/agents/xvm/Makefile	2007/12/21 20:13:48	1.18
+++ cluster/fence/agents/xvm/Makefile	2007/12/22 12:46:26	1.19
@@ -14,9 +14,13 @@
 TARGET2= fence_xvmd
 TARGET3= testprog
 
+SBINDIRT=$(TARGET1) $(TARGET2)
+
 include ../../../make/defines.mk
 include $(OBJDIR)/make/cobj.mk
 include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
 
 OBJS1=	fence_xvm.o \
 	ip_lookup.o
@@ -63,12 +67,3 @@
 	$(CC) -o $@ $^ $(XML_LDFLAGS)
 
 clean: generalclean
-
-install: all
-	if [ ! -d ${sbindir} ]; then \
-		install -d ${sbindir}; \
-	fi
-	install -m755 ${TARGET1} ${TARGET2} ${sbindir}
-
-uninstall:
-	${UNINSTALL} ${TARGET1} ${TARGET2} ${sbindir}
--- cluster/fence/fence_node/Makefile	2007/12/21 20:13:48	1.13
+++ cluster/fence/fence_node/Makefile	2007/12/22 12:46:26	1.14
@@ -13,9 +13,13 @@
 
 TARGET = fence_node
 
+SBINDIRT=$(TARGET)
+
 include ../../make/defines.mk
 include $(OBJDIR)/make/cobj.mk
 include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
 
 OBJS=	../fenced/agent.o \
 	fence_node.o
@@ -33,13 +37,4 @@
 ${TARGET}: ${OBJS}
 	$(CC) -o $@ $^ $(LDFLAGS)
 
-install: all
-	if [ ! -d ${sbindir} ]; then \
-		install -d ${sbindir}; \
-	fi
-	install -m755 ${TARGET} ${sbindir}
-
-uninstall:
-	${UNINSTALL} ${TARGET} ${sbindir}
-
 clean: generalclean
--- cluster/fence/fence_tool/Makefile	2007/12/21 20:13:49	1.20
+++ cluster/fence/fence_tool/Makefile	2007/12/22 12:46:26	1.21
@@ -13,9 +13,13 @@
 
 TARGET = fence_tool
 
+SBINDIRT=$(TARGET)
+
 include ../../make/defines.mk
 include $(OBJDIR)/make/cobj.mk
 include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
 
 OBJS= ../fenced/agent.o \
 	fence_tool.o
@@ -33,13 +37,4 @@
 ${TARGET}: ${OBJS}
 	$(CC) -o $@ $^ $(LDFLAGS)
 
-install: all
-	if [ ! -d ${sbindir} ]; then \
-		install -d ${sbindir}; \
-	fi
-	install -m755 ${TARGET} ${sbindir}
-
-uninstall:
-	${UNINSTALL} ${TARGET} ${sbindir}
-
 clean: generalclean
--- cluster/fence/fenced/Makefile	2007/12/21 20:13:49	1.16
+++ cluster/fence/fenced/Makefile	2007/12/22 12:46:26	1.17
@@ -13,9 +13,13 @@
 
 TARGET = fenced
 
+SBINDIRT=$(TARGET)
+
 include ../../make/defines.mk
 include $(OBJDIR)/make/cobj.mk
 include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
 
 OBJS=	main.o \
 	recover.o \
@@ -36,13 +40,4 @@
 ${TARGET}: ${OBJS}
 	$(CC) -o $@ $^ $(LDFLAGS)
 
-install: all
-	if [ ! -d ${sbindir} ]; then \
-		install -d ${sbindir}; \
-	fi
-	install -m755 ${TARGET} ${sbindir}
-
-uninstall:
-	${UNINSTALL} ${TARGET} ${sbindir}
-
 clean: generalclean
--- cluster/gfs/gfs_debug/Makefile	2007/12/21 20:13:49	1.13
+++ cluster/gfs/gfs_debug/Makefile	2007/12/22 12:46:26	1.14
@@ -13,9 +13,13 @@
 
 TARGET= gfs_debug
 
+SBINDIRT=$(TARGET)
+
 include ../../make/defines.mk
 include $(OBJDIR)/make/cobj.mk
 include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
 
 OBJS=	block_device.o \
 	basic.o \
@@ -34,13 +38,4 @@
 ${TARGET}: ${OBJS}
 	$(CC) -o $@ $^ $(LDFLAGS)
 
-install: all
-	if [ ! -d ${sbindir} ]; then \
-		install -d ${sbindir}; \
-	fi
-	install -m755 ${TARGET} ${sbindir}
-
-uninstall:
-	${UNINSTALL} ${TARGET} ${sbindir}
-
 clean: generalclean
--- cluster/gfs/gfs_edit/Makefile	2007/12/21 20:13:49	1.13
+++ cluster/gfs/gfs_edit/Makefile	2007/12/22 12:46:26	1.14
@@ -13,9 +13,13 @@
 
 TARGET= gfs_edit
 
+SBINDIRT=$(TARGET)
+
 include ../../make/defines.mk
 include $(OBJDIR)/make/cobj.mk
 include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
 
 OBJS= gfshex.o \
       hexedit.o
@@ -32,13 +36,4 @@
 ${TARGET}: ${OBJS}
 	$(CC) -o $@ $^ $(LDFLAGS)
 
-install: all
-	if [ ! -d ${sbindir} ]; then \
-		install -d ${sbindir}; \
-	fi
-	install -m755 ${TARGET} ${sbindir}
-
-uninstall:
-	${UNINSTALL} ${TARGET} ${sbindir}
-
 clean: generalclean
--- cluster/gfs/gfs_fsck/Makefile	2007/12/21 20:13:49	1.16
+++ cluster/gfs/gfs_fsck/Makefile	2007/12/22 12:46:27	1.17
@@ -13,9 +13,14 @@
 TARGET1= gfs_fsck
 TARGET2= fsck.gfs
 
+SBINDIRT=$(TARGET1)
+SBINSYMT=$(TARGET2)
+
 include ../../make/defines.mk
 include $(OBJDIR)/make/cobj.mk
 include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
 
 OBJS=	bio.o \
 	bitmap.o \
@@ -70,16 +75,6 @@
 clean: generalclean
 	rm -f test_block_list test_bitmap
 
-install: all
-	if [ ! -d ${sbindir} ]; then \
-		install -d ${sbindir}; \
-	fi
-	install -m755 ${TARGET1} ${sbindir}
-	cd ${sbindir}; ln -sf ${TARGET1} ${TARGET2}
-
-uninstall:
-	${UNINSTALL} ${TARGET1} ${TARGET2} ${sbindir}
-
 ${TARGET1}.pot: $(OBJS:.o=.c)
 	xgettext -C -F --keyword=print_log --keyword=log_debug --keyword=log_info --keyword=_ \
 	 --keyword=log_notice --keyword=log_warn --keyword=log_err --keyword=log_crit \
--- cluster/gfs/gfs_grow/Makefile	2007/12/21 20:13:49	1.14
+++ cluster/gfs/gfs_grow/Makefile	2007/12/22 12:46:27	1.15
@@ -13,9 +13,13 @@
 
 TARGET= gfs_grow
 
+SBINDIRT=$(TARGET)
+
 include ../../make/defines.mk
 include $(OBJDIR)/make/cobj.mk
 include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
 
 OBJS= main.o \
       ondisk.o
@@ -35,15 +39,6 @@
 depends:
 	$(MAKE) -C ../libgfs all
 
-install: all
-	if [ ! -d ${sbindir} ]; then \
-		install -d ${sbindir}; \
-	fi
-	install -m755 ${TARGET} ${sbindir}
-
-uninstall:
-	${UNINSTALL} ${TARGET} ${sbindir}
-
 clean: generalclean
 
 .PHONY: all ${TARGET}
--- cluster/gfs/gfs_jadd/Makefile	2007/12/21 20:13:50	1.14
+++ cluster/gfs/gfs_jadd/Makefile	2007/12/22 12:46:27	1.15
@@ -13,9 +13,13 @@
 
 TARGET= gfs_jadd
 
+SBINDIRT=$(TARGET)
+
 include ../../make/defines.mk
 include $(OBJDIR)/make/cobj.mk
 include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
 
 OBJS= main.o \
       ondisk.o
@@ -35,15 +39,6 @@
 depends:
 	$(MAKE) -C ../libgfs all
 
-install: all
-	if [ ! -d ${sbindir} ]; then \
-		install -d ${sbindir}; \
-	fi
-	install -m755 ${TARGET} ${sbindir}
-
-uninstall:
-	${UNINSTALL} ${TARGET} ${sbindir}
-
 clean: generalclean
 
 .PHONY: all ${TARGET}
--- cluster/gfs/gfs_mkfs/Makefile	2007/12/21 20:13:50	1.15
+++ cluster/gfs/gfs_mkfs/Makefile	2007/12/22 12:46:27	1.16
@@ -14,9 +14,14 @@
 TARGET1= gfs_mkfs
 TARGET2= mkfs.gfs
 
+SBINDIRT=$(TARGET1)
+SBINSYMT=$(TARGET2)
+
 include ../../make/defines.mk
 include $(OBJDIR)/make/cobj.mk
 include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
 
 OBJS=	device_geometry.o \
 	fs_geometry.o \
@@ -44,16 +49,6 @@
 depends:
 	$(MAKE) -C ../libgfs all
 
-install: all
-	if [ ! -d ${sbindir} ]; then \
-		install -d ${sbindir}; \
-	fi
-	install -m755 ${TARGET1} ${sbindir}
-	ln -f ${sbindir}/${TARGET1} ${sbindir}/${TARGET2}
-
-uninstall:
-	${UNINSTALL} ${TARGET1} ${TARGET2} ${sbindir}
-
 clean: generalclean
 
 .PHONY: all ${TARGET1}
--- cluster/gfs/gfs_quota/Makefile	2007/12/21 20:13:50	1.14
+++ cluster/gfs/gfs_quota/Makefile	2007/12/22 12:46:27	1.15
@@ -13,9 +13,13 @@
 
 TARGET= gfs_quota
 
+SBINDIRT=$(TARGET)
+
 include ../../make/defines.mk
 include $(OBJDIR)/make/cobj.mk
 include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
 
 OBJS=	check.o \
 	main.o \
@@ -33,13 +37,4 @@
 ${TARGET}: ${OBJS}
 	$(CC) -o $@ $^ $(LDFLAGS)
 
-install: all
-	if [ ! -d ${sbindir} ]; then \
-		install -d ${sbindir}; \
-	fi
-	install -m755 ${TARGET} ${sbindir}
-
-uninstall:
-	${UNINSTALL} ${TARGET} ${sbindir}
-
 clean: generalclean
--- cluster/gfs/gfs_tool/Makefile	2007/12/21 20:13:50	1.18
+++ cluster/gfs/gfs_tool/Makefile	2007/12/22 12:46:27	1.19
@@ -13,9 +13,13 @@
 
 TARGET= gfs_tool
 
+SBINDIRT=$(TARGET)
+
 include ../../make/defines.mk
 include $(OBJDIR)/make/cobj.mk
 include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
 
 OBJS=	counters.o \
 	df.o \
@@ -37,13 +41,4 @@
 ${TARGET}: ${OBJS}
 	$(CC) -o $@ $^ $(LDFLAGS)
 
-install: all
-	if [ ! -d ${sbindir} ]; then \
-		install -d ${sbindir}; \
-	fi
-	install -m755 ${TARGET} ${sbindir}
-
-uninstall:
-	${UNINSTALL} ${TARGET} ${sbindir}
-
 clean: generalclean
--- cluster/gfs/init.d/Makefile	2007/12/21 20:13:50	1.6
+++ cluster/gfs/init.d/Makefile	2007/12/22 12:46:27	1.7
@@ -12,15 +12,12 @@
 
 TARGET= gfs
 
+INITDT=$(TARGET)
+
 include ../../make/defines.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
 
 all:
 
 clean:
-
-install:
-	install -d ${DESTDIR}/etc/init.d
-	install $(S)/${TARGET} ${DESTDIR}/etc/init.d
-
-uninstall:
-	${UNINSTALL} ${TARGET} ${DESTDIR}/etc/init.d
--- cluster/gfs/libgfs/Makefile	2007/12/21 20:13:50	1.14
+++ cluster/gfs/libgfs/Makefile	2007/12/22 12:46:27	1.15
@@ -16,6 +16,8 @@
 include ../../make/defines.mk
 include $(OBJDIR)/make/cobj.mk
 include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
 
 CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
 CFLAGS += -D_GNU_SOURCE -DHELPER_PROGRAM
@@ -46,10 +48,6 @@
 	${AR} cru $@ $^
 	${RANLIB} $@
 
-install: all
-
-uninstall:
-
 clean: generalclean
 
 .PHONY: all
--- cluster/gfs-kernel/src/gfs/Makefile	2007/12/22 05:10:49	1.20
+++ cluster/gfs-kernel/src/gfs/Makefile	2007/12/22 12:46:27	1.21
@@ -11,9 +11,17 @@
 ###############################################################################
 ###############################################################################
 
+TARGET= gfs.ko
+
+KMODT=$(TARGET)
+KDIRT=fs/gfs
+KHEADT=gfs_ondisk.h gfs_ioctl.h
+
 ifndef USING_KBUILD
 include ../../../make/defines.mk
 include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
 endif
 
 PWD := $(shell pwd)
@@ -63,14 +71,4 @@
 all:
 	${MAKE} -C ${KERNEL_BUILD} M=${PWD} symverfile=${SYMVERFILE} modules USING_KBUILD=yes
 
-install: all
-	install -d ${module_dir}/fs/gfs
-	install gfs.ko ${module_dir}/fs/gfs
-	install -d ${incdir}/linux
-	install gfs_ondisk.h gfs_ioctl.h ${incdir}/linux
-
-uninstall:
-	${UNINSTALL} gfs.ko ${module_dir}/fs/gfs
-	${UNINSTALL} gfs_ondisk.h gfs_ioctl.h ${incdir}/linux
-
 clean: generalclean
--- cluster/gfs2/convert/Makefile	2007/12/21 20:13:51	1.15
+++ cluster/gfs2/convert/Makefile	2007/12/22 12:46:28	1.16
@@ -12,9 +12,13 @@
 
 TARGET= gfs2_convert
 
+SBINDIRT=$(TARGET)
+
 include ../../make/defines.mk
 include $(OBJDIR)/make/cobj.mk
 include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
 
 OBJS= gfs2_convert.o
 
@@ -33,15 +37,6 @@
 depends:
 	$(MAKE) -C ../libgfs2 all
 
-install: all
-	if [ ! -d ${sbindir} ]; then \
-		install -d ${sbindir}; \
-	fi
-	install -m755 ${TARGET} ${sbindir}
-
-uninstall:
-	${UNINSTALL} ${TARGET} ${sbindir}
-
 clean: generalclean
 
 .PHONY: all ${TARGET}
--- cluster/gfs2/edit/Makefile	2007/12/21 20:13:51	1.15
+++ cluster/gfs2/edit/Makefile	2007/12/22 12:46:28	1.16
@@ -13,9 +13,13 @@
 
 TARGET= gfs2_edit
 
+SBINDIRT=$(TARGET)
+
 include ../../make/defines.mk
 include $(OBJDIR)/make/cobj.mk
 include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
 
 OBJS=	gfs2hex.o \
 	savemeta.o \
@@ -38,15 +42,6 @@
 depends:
 	$(MAKE) -C ../libgfs2 all
 
-install: all
-	if [ ! -d ${sbindir} ]; then \
-		install -d ${sbindir}; \
-	fi
-	install -m755 ${TARGET} ${sbindir}
-
-uninstall:
-	${UNINSTALL} ${TARGET} ${sbindir}
-
 clean: generalclean
 
 .PHONY: all ${TARGET}
--- cluster/gfs2/fsck/Makefile	2007/12/21 20:13:51	1.19
+++ cluster/gfs2/fsck/Makefile	2007/12/22 12:46:28	1.20
@@ -13,9 +13,14 @@
 TARGET1= fsck.gfs2
 TARGET2= gfs2_fsck
 
+SBINDIRT=$(TARGET1)
+SBINSYMT=$(TARGET2)
+
 include ../../make/defines.mk
 include $(OBJDIR)/make/cobj.mk
 include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
 
 OBJS=	eattr.o \
 	fs_recovery.o \
@@ -64,16 +69,6 @@
 clean: generalclean
 	rm -f test_block_list test_bitmap
 
-install: all
-	if [ ! -d ${sbindir} ]; then \
-		install -d ${sbindir}; \
-	fi
-	install -m755 ${TARGET1} ${sbindir}
-	cd ${sbindir}; ln -sf ${TARGET1} ${TARGET2}
-
-uninstall:
-	${UNINSTALL} ${TARGET1} ${TARGET2} ${sbindir}
-
 ${TARGET1}.pot: $(OBJS:.o=.c)
 	xgettext -C -F --keyword=print_log --keyword=log_debug --keyword=log_info --keyword=_ \
 	 --keyword=log_notice --keyword=log_warn --keyword=log_err --keyword=log_crit \
--- cluster/gfs2/init.d/Makefile	2007/12/21 20:13:51	1.6
+++ cluster/gfs2/init.d/Makefile	2007/12/22 12:46:28	1.7
@@ -12,15 +12,12 @@
 
 TARGET= gfs2
 
+INITDT=$(TARGET)
+
 include ../../make/defines.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
 
 all:
 
 clean:
-
-install:
-	install -d ${DESTDIR}/etc/init.d
-	install $(S)/${TARGET} ${DESTDIR}/etc/init.d
-
-uninstall:
-	${UNINSTALL} ${TARGET} ${DESTDIR}/etc/init.d
--- cluster/gfs2/libgfs2/Makefile	2007/12/21 20:13:51	1.16
+++ cluster/gfs2/libgfs2/Makefile	2007/12/22 12:46:28	1.17
@@ -16,6 +16,8 @@
 include ../../make/defines.mk
 include $(OBJDIR)/make/cobj.mk
 include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
 
 CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_GNU_SOURCE
 CFLAGS += -I${KERNEL_SRC}/fs/gfs2/ -I${KERNEL_SRC}/include/
@@ -45,10 +47,6 @@
 	${AR} cru $@ $^
 	${RANLIB} $@
 
-install: all
-
-uninstall:
-
 clean: generalclean
 
 .PHONY: all
--- cluster/gfs2/mkfs/Makefile	2007/12/21 20:13:51	1.24
+++ cluster/gfs2/mkfs/Makefile	2007/12/22 12:46:28	1.25
@@ -8,9 +8,14 @@
 TARGET3= gfs2_jadd
 TARGET4= gfs2_grow
 
+SBINDIRT=$(TARGET1)
+SBINSYMT=$(TARGET2) $(TARGET3) $(TARGET4)
+
 include ../../make/defines.mk
 include $(OBJDIR)/make/cobj.mk
 include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
 
 OBJS=	main.o \
 	main_mkfs.o \
@@ -42,16 +47,6 @@
 depends:
 	$(MAKE) -C ../libgfs2 all
 
-install: all
-	install -m 0755 ${TARGET1} ${sbindir}
-	cd ${sbindir}; \
-	 ln -sf ${TARGET1} ${TARGET2}; \
-	 ln -sf ${TARGET1} ${TARGET3}; \
-	 ln -sf ${TARGET1} ${TARGET4}
-
-uninstall:
-	${UNINSTALL} ${TARGET1} ${TARGET2} ${TARGET3} ${TARGET4} ${sbindir}
-
 clean: generalclean
 
 .PHONY: all ${TARGET1}
--- cluster/gfs2/quota/Makefile	2007/12/21 20:13:52	1.16
+++ cluster/gfs2/quota/Makefile	2007/12/22 12:46:28	1.17
@@ -13,9 +13,13 @@
 
 TARGET= gfs2_quota
 
+SBINDIRT=$(TARGET)
+
 include ../../make/defines.mk
 include $(OBJDIR)/make/cobj.mk
 include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
 
 OBJS=	main.o \
 	names.o \
@@ -36,12 +40,6 @@
 depends:
 	$(MAKE) -C ../libgfs2 all
 
-install: all
-	install -m 0755 ${TARGET} ${sbindir}
-
-uninstall:
-	${UNINSTALL} ${TARGET} ${sbindir}
-
 clean: generalclean
 
 .PHONY: all ${TARGET}
--- cluster/gfs2/tool/Makefile	2007/12/21 20:13:52	1.18
+++ cluster/gfs2/tool/Makefile	2007/12/22 12:46:28	1.19
@@ -13,9 +13,13 @@
 
 TARGET= gfs2_tool
 
+SBINDIRT=$(TARGET)
+
 include ../../make/defines.mk
 include $(OBJDIR)/make/cobj.mk
 include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
 
 OBJS=	counters.o \
 	df.o \
@@ -41,15 +45,6 @@
 depends:
 	$(MAKE) -C ../libgfs2 all
 
-install: all
-	if [ ! -d ${sbindir} ]; then \
-		install -d ${sbindir}; \
-	fi
-	install -m755 ${TARGET} ${sbindir}
-
-uninstall:
-	${UNINSTALL} ${TARGET} ${sbindir}
-
 clean: generalclean
 
 .PHONY: all ${TARGET}
--- cluster/gnbd/client/Makefile	2007/12/21 20:13:52	1.18
+++ cluster/gnbd/client/Makefile	2007/12/22 12:46:28	1.19
@@ -14,9 +14,13 @@
 TARGET1= gnbd_recvd
 TARGET2= gnbd_monitor
 
+SBINDIRT=$(TARGET1) $(TARGET2)
+
 include ../../make/defines.mk
 include $(OBJDIR)/make/cobj.mk
 include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
 
 OBJS1=	gnbd_recvd.o
 
@@ -41,14 +45,4 @@
 ${TARGET2}: ${SHAREDOBJS} ${OBJS2}
 	$(CC) -o $@ $^ $(LDFLAGS)
 
-install: all
-	if [ ! -d ${sbindir} ]; then \
-		install -d ${sbindir}; \
-	fi
-	install -m755 ${TARGET1} ${sbindir}
-	install -m755 ${TARGET2} ${sbindir}
-
-uninstall:
-	${UNINSTALL} ${TARGET1} ${TARGET2} ${sbindir}
-
 clean: generalclean
--- cluster/gnbd/server/Makefile	2007/12/21 20:13:52	1.18
+++ cluster/gnbd/server/Makefile	2007/12/22 12:46:29	1.19
@@ -14,9 +14,13 @@
 TARGET1= gnbd_serv
 TARGET2= gnbd_clusterd
 
+SBINDIRT=$(TARGET1) $(TARGET2)
+
 include ../../make/defines.mk
 include $(OBJDIR)/make/cobj.mk
 include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
 
 OBJS1=	gnbd_serv.o \
 	local_req.o \
@@ -46,14 +50,4 @@
 ${TARGET2}: ${SHAREDOBJS} ${OBJS2}
 	$(CC) -o $@ $^ $(LDFLAGS)
 
-install: all
-	if [ ! -d ${sbindir} ]; then \
-		install -d ${sbindir}; \
-	fi
-	install -m755 ${TARGET1} ${sbindir}
-	install -m755 ${TARGET2} ${sbindir}
-
-uninstall:
-	${UNINSTALL} ${TARGET1} ${TARGET2} ${sbindir}
-
 clean: generalclean
--- cluster/gnbd/tools/fence_gnbd/Makefile	2007/12/21 20:13:52	1.9
+++ cluster/gnbd/tools/fence_gnbd/Makefile	2007/12/22 12:46:29	1.10
@@ -13,9 +13,13 @@
 
 TARGET= fence_gnbd
 
+SBINDIRT=$(TARGET)
+
 include ../../../make/defines.mk
 include $(OBJDIR)/make/cobj.mk
 include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
 
 OBJS= main.o
 
@@ -27,13 +31,4 @@
 ${TARGET}: ${OBJS}
 	$(CC) -o $@ $^ $(LDFLAGS)
 
-install: all
-	if [ ! -d ${sbindir} ]; then \
-		install -d ${sbindir}; \
-	fi
-	install -m755 ${TARGET} ${sbindir}
-
-uninstall:
-	${UNINSTALL} ${TARGET} ${sbindir}
-
 clean: generalclean
--- cluster/gnbd/tools/gnbd_export/Makefile	2007/12/21 20:13:52	1.19
+++ cluster/gnbd/tools/gnbd_export/Makefile	2007/12/22 12:46:29	1.20
@@ -13,9 +13,13 @@
 
 TARGET= gnbd_export
 
+SBINDIRT=$(TARGET) gnbd_get_uid
+
 include ../../../make/defines.mk
 include $(OBJDIR)/make/cobj.mk
 include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
 
 OBJS=	gnbd_export.o \
 	../../utils/gnbd_utils.o \
@@ -28,19 +32,12 @@
 
 LDFLAGS += -L${libdir} -L${cmanlibdir} -lcman -ldl -lpthread
 
-all: ${TARGET}
+all: ${TARGET} gnbd_get_uid
 
 ${TARGET}: ${OBJS}
 	$(CC) -o $@ $^ $(LDFLAGS)
 
-install: all 
-	if [ ! -d ${sbindir} ]; then \
-		install -d ${sbindir}; \
-	fi
-	install -m755 ${TARGET} ${sbindir}
-	install -m755 $(S)/gnbd_get_uid ${sbindir}
-
-uninstall:
-	${UNINSTALL} ${TARGET} gnbd_get_uid ${sbindir}
+gnbd_get_uid:
+	cp $(S)/$@ $@
 
 clean: generalclean
--- cluster/gnbd/tools/gnbd_import/Makefile	2007/12/21 20:13:52	1.16
+++ cluster/gnbd/tools/gnbd_import/Makefile	2007/12/22 12:46:29	1.17
@@ -13,9 +13,13 @@
 
 TARGET= gnbd_import
 
+SBINDIRT=$(TARGET)
+
 include ../../../make/defines.mk
 include $(OBJDIR)/make/cobj.mk
 include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
 
 OBJS=	gnbd_import.o \
 	../../utils/gnbd_utils.o \
@@ -34,13 +38,4 @@
 ${TARGET}: ${OBJS}
 	$(CC) -o $@ $^ $(LDFLAGS)
 
-install: all
-	if [ ! -d ${sbindir} ]; then \
-		install -d ${sbindir}; \
-	fi
-	install -m755 ${TARGET} ${sbindir}
-
-uninstall:
-	${UNINSTALL} ${TARGET} ${sbindir}
-
 clean: generalclean
--- cluster/gnbd/utils/Makefile	2007/12/21 20:13:53	1.4
+++ cluster/gnbd/utils/Makefile	2007/12/22 12:46:29	1.5
@@ -14,6 +14,8 @@
 include ../../make/defines.mk
 include $(OBJDIR)/make/cobj.mk
 include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
 
 SHAREDOBJS= member_cman.o \
 	    trans.o \
@@ -24,8 +26,4 @@
 
 all: ${SHAREDOBJS}
 
-install:
-
-uninstall:
-
 clean: generalclean
--- cluster/gnbd-kernel/src/Makefile	2007/12/22 05:10:49	1.10
+++ cluster/gnbd-kernel/src/Makefile	2007/12/22 12:46:29	1.11
@@ -11,9 +11,17 @@
 ###############################################################################
 ###############################################################################
 
+TARGET= gnbd.ko
+
+KMODT=$(TARGET)
+KDIRT=drivers/block/gnbd
+KHEADT=gnbd.h
+
 ifndef USING_KBUILD
 include ../../make/defines.mk
 include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
 endif
 
 PWD = $(shell pwd)
@@ -25,14 +33,4 @@
 all:
 	${MAKE} -C ${KERNEL_BUILD} M=${PWD} symverfile=${SYMVERFILE} modules USING_KBUILD=yes
 
-install: all
-	install -d ${incdir}/linux
-	install gnbd.h ${incdir}/linux
-	install -d ${module_dir}/drivers/block/gnbd
-	install gnbd.ko ${module_dir}/drivers/block/gnbd
-
-uninstall:
-	${UNINSTALL} gnbd.ko ${module_dir}/drivers/block/gnbd
-	${UNINSTALL} gnbd.h ${incdir}/linux
-
 clean: generalclean
--- cluster/group/daemon/Makefile	2007/12/22 12:18:54	1.25
+++ cluster/group/daemon/Makefile	2007/12/22 12:46:29	1.26
@@ -12,9 +12,13 @@
 
 TARGET= groupd
 
+SBINDIRT=$(TARGET)
+
 include ../../make/defines.mk
 include $(OBJDIR)/make/cobj.mk
 include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
 
 OBJS=	app.o \
 	cpg.o \
@@ -34,11 +38,3 @@
 	$(CC) -o $@ $^ $(LDFLAGS)
 
 clean: generalclean
-
-install: all
-	install -d ${sbindir}
-	install ${TARGET} ${sbindir}
-
-uninstall:
-	${UNINSTALL} ${TARGET} ${sbindir}
-
--- cluster/group/dlm_controld/Makefile	2007/12/21 20:13:53	1.15
+++ cluster/group/dlm_controld/Makefile	2007/12/22 12:46:29	1.16
@@ -12,9 +12,13 @@
 
 TARGET= dlm_controld
 
+SBINDIRT=$(TARGET)
+
 include ../../make/defines.mk
 include $(OBJDIR)/make/cobj.mk
 include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
 
 OBJS=	main.o \
 	member_cman.o \
@@ -39,13 +43,6 @@
 depends:
 	$(MAKE) -C ../lib all
 
-install: all
-	install -d ${sbindir}
-	install ${TARGET} ${sbindir}
-
-uninstall:
-	${UNINSTALL} ${TARGET} ${sbindir}
-
 clean: generalclean
 
 .PHONY: all ${TARGET}
--- cluster/group/gfs_controld/Makefile	2007/12/21 20:13:53	1.17
+++ cluster/group/gfs_controld/Makefile	2007/12/22 12:46:29	1.18
@@ -12,9 +12,13 @@
 
 TARGET= gfs_controld
 
+SBINDIRT=$(TARGET)
+
 include ../../make/defines.mk
 include $(OBJDIR)/make/cobj.mk
 include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
 
 OBJS= 	main.o \
 	member_cman.o \
@@ -41,13 +45,6 @@
 depends:
 	$(MAKE) -C ../lib all
 
-install: all
-	install -d ${sbindir}
-	install ${TARGET} ${sbindir}
-
-uninstall:
-	${UNINSTALL} ${TARGET} ${sbindir}
-
 clean: generalclean
 
 .PHONY: all ${TARGET}
--- cluster/group/lib/Makefile	2007/12/21 20:13:54	1.11
+++ cluster/group/lib/Makefile	2007/12/22 12:46:29	1.12
@@ -15,6 +15,8 @@
 include ../../make/defines.mk
 include $(OBJDIR)/make/cobj.mk
 include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
 
 STATICLIB=$(TARGET).a
 
@@ -28,8 +30,4 @@
 	${AR} r $@ $^
 	${RANLIB} $@
 
-install: all
-
-uninstall:
-
 clean: generalclean
--- cluster/group/tool/Makefile	2007/12/21 20:13:54	1.14
+++ cluster/group/tool/Makefile	2007/12/22 12:46:30	1.15
@@ -12,9 +12,13 @@
 
 TARGET= group_tool
 
+SBINDIRT=$(TARGET)
+
 include ../../make/defines.mk
 include $(OBJDIR)/make/cobj.mk
 include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
 
 OBJS=	main.o
 
@@ -33,11 +37,4 @@
 
 clean: generalclean
 
-install: all
-	install -d ${sbindir}
-	install ${TARGET} ${sbindir}
-
-uninstall:
-	${UNINSTALL} ${TARGET} ${sbindir}
-
 .PHONY: all ${TARGET}
/cvs/cluster/cluster/make/install.mk,v  -->  standard output
revision 1.1
--- cluster/make/install.mk
+++ -	2007-12-22 12:46:36.187963000 +0000
@@ -0,0 +1,45 @@
+install: all
+ifdef LIBDIRT
+	install -d ${libdir}
+	install -m644 ${LIBDIRT} ${libdir}
+endif
+ifdef LIBSYMT
+	cp -a ${LIBSYMT} ${libdir}
+endif
+ifdef INCDIRT
+	install -d ${incdir}
+	for i in ${INCDIRT}; do \
+	  install -m644 $(S)/$$i ${incdir}; \
+	done
+endif
+ifdef SBINDIRT
+	install -d ${sbindir}
+	install -m755 ${SBINDIRT} ${sbindir}
+endif
+ifdef SBINSYMT
+	cp -a ${SBINSYMT} ${sbindir}
+endif
+ifdef LCRSOT
+	install -d ${libexecdir}/lcrso
+	install -m644 ${LCRSOT} ${libexecdir}/lcrso
+endif
+ifdef INITDT
+	install -d ${DESTDIR}/etc/init.d
+	for i in ${INITDT}; do \
+	  install -m755 $(S)/$$i ${DESTDIR}/etc/init.d; \
+	done
+endif
+ifdef UDEVT
+	install -d ${DESTDIR}/etc/udev/rules.d
+	for i in ${UDEVT}; do \
+	  install -m644 $(S)/$$i ${DESTDIR}/etc/udev/rules.d; \
+	done
+endif
+ifdef KMODT
+	install -d ${module_dir}/${KDIRT}
+	install -m644 ${KMODT} ${module_dir}/${KDIRT}
+endif
+ifdef KHEADT
+	install -d ${incdir}/linux
+	install -m644 ${KHEADT} ${incdir}/linux
+endif
/cvs/cluster/cluster/make/uninstall.mk,v  -->  standard output
revision 1.1
--- cluster/make/uninstall.mk
+++ -	2007-12-22 12:46:36.267099000 +0000
@@ -0,0 +1,31 @@
+uninstall:
+ifdef LIBDIRT
+	${UNINSTALL} ${LIBDIRT} ${libdir}
+endif
+ifdef LIBSYMT
+	${UNINSTALL} ${LIBSYMT} ${libdir}
+endif
+ifdef INCDIRT
+	${UNINSTALL} ${INCDIRT} ${incdir}
+endif
+ifdef SBINDIRT
+	${UNINSTALL} ${SBINDIRT} ${sbindir}
+endif
+ifdef SBINSYMT
+	${UNINSTALL} ${SBINDIRT} ${sbindir}
+endif
+ifdef LCRSOT
+	${UNINSTALL} ${LCRSOT} ${libexecdir}/lcrso
+endif
+ifdef INITDT
+	${UNINSTALL} ${INITDT} ${DESTDIR}/etc/init.d
+endif
+ifdef UDEVT
+	${UNINSTALL} ${UDEVT} {DESTDIR}/etc/udev/rules.d
+endif
+ifdef KMODT
+	${UNINSTALL} ${KMODT} ${module_dir}/${KDIRT}
+endif
+ifdef KHEADT
+	${UNINSTALL} ${KHEADT} ${incdir}/linux
+endif
--- cluster/make/fenceperl.mk	2007/12/21 20:13:54	1.3
+++ cluster/make/fenceperl.mk	2007/12/22 12:46:30	1.4
@@ -1,4 +1,8 @@
+SBINDIRT=$(TARGET)
+
 include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
 
 all: $(TARGET)
 
@@ -11,13 +15,4 @@
 	awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(S)/$(TARGET).pl >> $(TARGET)
 	chmod +x $(TARGET)
 
-install: all
-	if [ ! -d ${sbindir} ]; then \
-		install -d ${sbindir}; \
-	fi
-	install -m755 ${TARGET} ${sbindir}
-
-uninstall:
-	${UNINSTALL} ${TARGET} ${sbindir}
-
 clean: generalclean
--- cluster/make/fencepy.mk	2007/12/21 20:13:54	1.3
+++ cluster/make/fencepy.mk	2007/12/22 12:46:30	1.4
@@ -1,4 +1,8 @@
+SBINDIRT=$(TARGET)
+
 include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
 
 all: $(TARGET)
 
@@ -11,13 +15,4 @@
 	awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(S)/$(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: generalclean
--- cluster/rgmanager/init.d/Makefile	2007/12/21 20:13:55	1.5
+++ cluster/rgmanager/init.d/Makefile	2007/12/22 12:46:30	1.6
@@ -12,17 +12,14 @@
 
 TARGET= rgmanager
 
+INITDT=$(TARGET)
+
 include ../../make/defines.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
 
 all:
 
 clean:
 
 check:
-
-install:
-	install -d ${DESTDIR}/etc/init.d
-	install $(S)/${TARGET} ${DESTDIR}/etc/init.d
-
-uninstall:
-	${UNINSTALL} ${TARGET} ${DESTDIR}/etc/init.d
--- cluster/rgmanager/src/clulib/Makefile	2007/12/21 20:13:55	1.22
+++ cluster/rgmanager/src/clulib/Makefile	2007/12/22 12:46:30	1.23
@@ -17,6 +17,8 @@
 include ../../../make/defines.mk
 include $(OBJDIR)/make/cobj.mk
 include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
 
 OBJS1=	clulog.o daemon_init.o signals.o msgsimple.o \
 	gettid.o rg_strings.o message.o members.o fdops.o \
@@ -38,10 +40,6 @@
 
 all: ${TARGET1} ${TARGET2} ${TARGET3}
 
-install: all
-
-uninstall:
-
 ${TARGET1}: ${OBJS1}
 	${AR} cru $@ $^
 	${RANLIB} $@
--- cluster/rgmanager/src/daemons/Makefile	2007/12/21 20:13:55	1.29
+++ cluster/rgmanager/src/daemons/Makefile	2007/12/22 12:46:30	1.30
@@ -15,9 +15,13 @@
 TARGET3= rg_test
 TARGET4= dtest
 
+SBINDIRT=$(TARGET1) $(TARGET2) $(TARGET3)
+
 include ../../../make/defines.mk
 include $(OBJDIR)/make/cobj.mk
 include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
 
 OBJS1=	depends.o \
 	fo_domain.o \
@@ -115,13 +119,6 @@
 depends:
 	$(MAKE) -C ../clulib all
 
-install: all
-	install -d ${sbindir}
-	install -m755 ${TARGET1} ${TARGET2} ${TARGET3} ${sbindir}
-
-uninstall:
-	${UNINSTALL} ${TARGET1} ${TARGET2} ${TARGET3} ${sbindir}
-
 clean: generalclean
 	rm -f tests/*.out*
 
--- cluster/rgmanager/src/resources/Makefile	2007/12/20 22:10:05	1.22
+++ cluster/rgmanager/src/resources/Makefile	2007/12/22 12:46:30	1.23
@@ -32,9 +32,6 @@
 all:
 
 install: all
-	echo ${sharedir}
-	echo ${sbindir}
-	install -d ${sharedir}
 	install -d ${sharedir}/utils
 	for i in $(RESOURCES); do \
 	 install $(S)/$$i ${sharedir}; \
--- cluster/rgmanager/src/utils/Makefile	2007/12/21 20:13:55	1.22
+++ cluster/rgmanager/src/utils/Makefile	2007/12/22 12:46:30	1.23
@@ -17,9 +17,13 @@
 TARGET5= clulog
 TARGET6= clunfslock
 
+SBINDIRT=$(TARGET1) $(TARGET2) $(TARGET3) $(TARGET4) $(TARGET5) $(TARGET6)
+
 include ../../../make/defines.mk
 include $(OBJDIR)/make/cobj.mk
 include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
 
 DISABLEDTARGETS= cluarp
 
@@ -56,13 +60,6 @@
 depends:
 	$(MAKE) -C ../clulib all
 
-install: all
-	install -d ${sbindir}
-	install ${TARGET1} ${TARGET2} ${TARGET3} ${TARGET4} ${TARGET5} ${TARGET6} ${sbindir}
-
-uninstall:
-	${UNINSTALL} ${TARGET1} ${TARGET2} ${TARGET3} ${TARGET4} ${TARGET5} ${TARGET6} ${sbindir}
-
 clean: generalclean
 
 .PHONY: all ${TARGET1} ${TARGET2} ${TARGET3} ${TARGET4} ${TARGET5} ${TARGET6}


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