[Cluster-devel] cluster cman/init.d/Makefile rgmanager/src/res ...

[fabbione at sourceware.org]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	fabbione at sourceware.org	2008-01-08 04:46:32

Modified files:
	cman/init.d    : Makefile 
	rgmanager/src/resources: Makefile 
	make           : install.mk 
	rgmanager/init.d: Makefile 

Log message:
	Fix "off the source tree" install. This was a small regression introduced
	with the /etc/cluster/cluster.conf configure bits.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/init.d/Makefile.diff?cvsroot=cluster&r1=1.9&r2=1.10
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/resources/Makefile.diff?cvsroot=cluster&r1=1.26&r2=1.27
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/make/install.mk.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/init.d/Makefile.diff?cvsroot=cluster&r1=1.8&r2=1.9

--- cluster/cman/init.d/Makefile	2008/01/07 05:52:28	1.9
+++ cluster/cman/init.d/Makefile	2008/01/08 04:46:32	1.10
@@ -12,7 +12,7 @@
 
 TARGET=cman
 
-INITDT=$(TARGET1) qdiskd
+INITDT=$(TARGET) qdiskd
 
 all: $(TARGET)
 
@@ -22,7 +22,7 @@
 include $(OBJDIR)/make/uninstall.mk
 
 $(TARGET):
-	cat $(TARGET).in | sed \
+	cat $(S)/$(TARGET).in | sed \
 		-e 's#@CONFDIR@#${CONFDIR}#g' \
 		-e 's#@CONFFILE@#${CONFFILE}#g' \
 	> $(TARGET)
--- cluster/rgmanager/src/resources/Makefile	2008/01/07 05:52:29	1.26
+++ cluster/rgmanager/src/resources/Makefile	2008/01/08 04:46:32	1.27
@@ -30,12 +30,13 @@
 GENERAL_TARGETS=ocf-shellfuncs svclib_nfslock default_event_script.sl
 
 UTIL_TARGETS= \
-	utils/config-utils.sh utils/ra-skelet.sh utils/messages.sh \
+	utils/ra-skelet.sh utils/messages.sh \
 	utils/httpd-parse-config.pl utils/tomcat-parse-config.pl \
 	utils/member_util.sh
 
 $(TARGET):
-	cat $(TARGET).in | sed \
+	mkdir utils
+	cat $(S)/$(TARGET).in | sed \
 		-e 's#@CONFDIR@#${CONFDIR}#g' \
 		-e 's#@CONFFILE@#${CONFFILE}#g' \
 	> $(TARGET)
@@ -51,6 +52,7 @@
 	for i in $(UTIL_TARGETS); do \
 	 install $(S)/$$i ${sharedir}/utils; \
 	done
+	install -m644 $(TARGET) ${sharedir}/utils
 
 uninstall:
 	${UNINSTALL} ${RESOURCES} ${GENERAL_TARGETS} ${METADATA} ${UTIL_TARGETS} ${sharedir}
--- cluster/make/install.mk	2007/12/22 12:46:30	1.1
+++ cluster/make/install.mk	2008/01/08 04:46:32	1.2
@@ -26,7 +26,11 @@
 ifdef INITDT
 	install -d ${DESTDIR}/etc/init.d
 	for i in ${INITDT}; do \
-	  install -m755 $(S)/$$i ${DESTDIR}/etc/init.d; \
+	  if [ -f $(S)/$$i ]; then \
+	    install -m755 $(S)/$$i ${DESTDIR}/etc/init.d; \
+	  else \
+	    install -m755 $$i ${DESTDIR}/etc/init.d; \
+	  fi; \
 	done
 endif
 ifdef UDEVT
--- cluster/rgmanager/init.d/Makefile	2008/01/07 05:52:29	1.8
+++ cluster/rgmanager/init.d/Makefile	2008/01/08 04:46:32	1.9
@@ -22,7 +22,7 @@
 include $(OBJDIR)/make/uninstall.mk
 
 $(TARGET):
-	cat $(TARGET).in | sed \
+	cat $(S)/$(TARGET).in | sed \
 		-e 's#@CONFDIR@#${CONFDIR}#g' \
 		-e 's#@CONFFILE@#${CONFFILE}#g' \
 	> $(TARGET)