From mboxrd@z Thu Jan  1 00:00:00 1970
From: pcaulfield@sourceware.org <pcaulfield@sourceware.org>
Date: 3 Jul 2006 07:58:39 -0000
Subject: [Cluster-devel] cluster/cman/cman_tool Makefile join.c
Message-ID: <20060703075839.24373.qmail@sourceware.org>
List-Id: <cluster-devel.redhat.com>
To: cluster-devel.redhat.com
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	pcaulfield at sourceware.org	2006-07-03 07:58:39

Modified files:
	cman/cman_tool : Makefile join.c 

Log message:
	Run aisexec from SBINDIR

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/cman_tool/Makefile.diff?cvsroot=cluster&r1=1.14&r2=1.15
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/cman_tool/join.c.diff?cvsroot=cluster&r1=1.45&r2=1.46

--- cluster/cman/cman_tool/Makefile	2006/06/12 21:58:12	1.14
+++ cluster/cman/cman_tool/Makefile	2006/07/03 07:58:39	1.15
@@ -18,7 +18,7 @@
 CFLAGS+= -g -I${ccsincdir} -I${incdir} -I${top_srcdir}/config \
 	-DCMAN_RELEASE_NAME=\"${RELEASE}\" -I../lib
 
-CFLAGS+=-DDEBUG
+CFLAGS+=-DDEBUG -fstack-protector -Wp,-D_FORTIFY_SOURCE=2
 
 TARGET=cman_tool
 
@@ -34,7 +34,7 @@
 	$(CC) $(CFLAGS) -c -o $@ $<
 
 join.o: join.c cman_tool.h
-	$(CC) $(CFLAGS) -c -o $@ $< -DLIBEXECDIR=\"${libexecdir}/cman\"
+	$(CC) $(CFLAGS) -c -o $@ $< -DSBINDIR=\"${sbindir}/cman\"
 
 install: cman_tool
 	install -d ${sbindir}
--- cluster/cman/cman_tool/join.c	2006/05/10 14:20:06	1.45
+++ cluster/cman/cman_tool/join.c	2006/07/03 07:58:39	1.46
@@ -128,9 +128,9 @@
 
 	case 0: // child
 		be_daemon(!comline->verbose);
-		chdir(LIBEXECDIR);
+		chdir(SBINDIR);
 		execve("./aisexec", argv, envp);
-		die("execve of " LIBEXECDIR "/aisexec failed: %s", strerror(errno));
+		die("execve of " SBINDIR "/aisexec failed: %s", strerror(errno));
 		break;
 
 	default: //parent