[Cluster-devel] cluster/rgmanager/src/resources Makefile servi ...

[Cluster-devel] cluster/rgmanager/src/resources Makefile servi ...

[lhh]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	STABLE
Changes by:	lhh at sourceware.org	2007-02-14 19:03:10

Modified files:
	rgmanager/src/resources: Makefile service.sh 

Log message:
	Make sure utility stuff is installed in the right place

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/resources/Makefile.diff?cvsroot=cluster&only_with_tag=STABLE&r1=1.4.2.3.6.4&r2=1.4.2.3.6.5
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/resources/service.sh.diff?cvsroot=cluster&only_with_tag=STABLE&r1=1.1.2.1.6.4&r2=1.1.2.1.6.5

--- cluster/rgmanager/src/resources/Makefile	2007/01/22 23:10:01	1.4.2.3.6.4
+++ cluster/rgmanager/src/resources/Makefile	2007/02/14 19:03:10	1.4.2.3.6.5
@@ -25,7 +25,9 @@
 METADATA=apache.metadata openldap.metadata samba.metadata \
 	mysql.metadata postgres-8.metadata tomcat-5.metadata
 
-TARGETS=${RESOURCES} ocf-shellfuncs svclib_nfslock \
+TARGETS=${RESOURCES} ocf-shellfuncs svclib_nfslock
+
+UTIL_TARGETS= \
 	utils/config-utils.sh utils/ra-skelet.sh utils/messages.sh \
 	utils/httpd-parse-config.pl utils/tomcat-parse-config.pl
 
@@ -37,9 +39,11 @@
 	install -d ${sharedir}
 	install -d ${sharedir}/utils
 	install $(TARGETS) ${sharedir}
+	install $(UTIL_TARGETS) ${sharedir}/utils
 	install -m 644 $(METADATA) ${sharedir}
 
 uninstall:
+	${UNINSTALL} ${UTIL_TARGETS} ${sharedir}/utils
 	${UNINSTALL} ${TARGETS} ${sharedir}
 
 clean:
--- cluster/rgmanager/src/resources/service.sh	2007/02/14 16:23:06	1.1.2.1.6.4
+++ cluster/rgmanager/src/resources/service.sh	2007/02/14 19:03:10	1.1.2.1.6.5
@@ -149,7 +149,7 @@
         <child type="netfs" start="4" stop="6"/>
 	<child type="nfsexport" start="5" stop="5"/>
 
-	<child type="nfsclient" start="6" stop="4"/>
+	<child type="nfsclient" start="6" stop=""/>
 
         <child type="ip" start="7" stop="2"/>
         <child type="smb" start="8" stop="3"/>