Fix more build/install glitches

git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@1837 fd59a12c-fef9-0310-b244-a6a79926bd2f

configure.in

@@ -316,7 +316,7 @@ AC_DEFINE_UNQUOTED(U64T, "$U64T", Correct printf format for logging uint64_t)
 dnl Variables needed for substitution
 
 case x$LCRSODIR in
-     x) LCRSODIR=$libexecdir/corosync/lcrso;;
+     x) LCRSODIR=$libexecdir/lcrso;;
 esac
 AC_DEFINE_UNQUOTED(LCRSODIR, "$LCRSODIR", Location of Corosync lcrso plugins)
 AC_SUBST(LCRSODIR)

exec/Makefile.am

@@ -99,9 +99,10 @@ all-local: $(LCRSO) $(SHARED_LIBS)
 
 install-exec-local:
 	$(INSTALL) -d $(DESTDIR)/$(libdir)
-	$(INSTALL) -m 644 $(SHARED_LIBS) $(SHARED_LIBS_SO) $(SHARED_LIBS_SO_TWO) $(DESTDIR)/$(libdir)
+	$(INSTALL) -m 755 $(SHARED_LIBS) $(DESTDIR)/$(libdir)
+	cp -a $(SHARED_LIBS_SO) $(SHARED_LIBS_SO_TWO) $(DESTDIR)/$(libdir)
 	$(INSTALL) -d $(DESTDIR)/$(LCRSODIR)
-	$(INSTALL) -m 644 $(LCRSO) $(DESTDIR)/$(LCRSODIR)
+	$(INSTALL) -m 755 $(LCRSO) $(DESTDIR)/$(LCRSODIR)
 
 clean-local:
 	rm -f corosync *.o *.lcrso gmon.out *.da *.bb *.bbg *.so*

include/Makefile.am

@@ -32,14 +32,14 @@
 MAINTAINERCLEANFILES    = Makefile.in corosync/config.h.in
 
 CS_H			= hdb.h cs_config.h cpg.h cfg.h evs.h ipc_gen.h mar_gen.h swab.h 	\
-		  	coroipc.h confdb.h list.h corotypes.h
+		  	coroipc.h confdb.h list.h corotypes.h quorum.h votequorum.h
 
 CS_INTERNAL_H		= ipc_cfg.h ipc_confdb.h ipc_cpg.h ipc_evs.h ipc_pload.h ipc_quorum.h 	\
 			jhash.h mar_cpg.h pload.h queue.h quorum.h rmd.h sq.h
 
 LCR_H			= lcr_ckpt.h lcr_comp.h	lcr_ifact.h
 
-ENGINE_H		= config.h coroapi.h logsys.h objdb.h
+ENGINE_H		= config.h coroapi.h logsys.h objdb.h quorum.h
 
 TOTEM_H			= coropoll.h totem.h totemip.h totempg.h
 

lcr/Makefile.am

@@ -66,7 +66,7 @@ all-local: $(LCRSO)
 
 install-exec-local:
 	$(INSTALL) -d $(DESTDIR)/$(LCRSODIR)
-	$(INSTALL) -m 644 $(LCRSO) $(DESTDIR)/$(LCRSODIR)
+	$(INSTALL) -m 755 $(LCRSO) $(DESTDIR)/$(LCRSODIR)
 
 clean-local:
 	rm -f *.o *.a *.so* *.da *.bb *.bbg *.lcrso

lib/Makefile.am

@@ -86,7 +86,8 @@ all-local: $(SHARED_LIBS)
 
 install-exec-local:
 	$(INSTALL) -d $(DESTDIR)/$(libdir)
-	$(INSTALL) -m 644 $(SHARED_LIBS) $(SHARED_LIBS_SO) $(SHARED_LIBS_SO_TWO) $(DESTDIR)/$(libdir)
+	$(INSTALL) -m 755 $(SHARED_LIBS) $(DESTDIR)/$(libdir)
+	cp -a $(SHARED_LIBS_SO) $(SHARED_LIBS_SO_TWO) $(DESTDIR)/$(libdir)
 
 clean-local:
 	rm -f *.o *.a *.so* *.da *.bb *.bbg

services/Makefile.am

@@ -33,12 +33,18 @@ MAINTAINERCLEANFILES    = Makefile.in
 
 AM_CFLAGS		= -fPIC
 INCLUDES       		= -I$(top_builddir)/include  -I$(top_srcdir)/include
-LCRSO			= service_evs.lcrso service_cfg.lcrso service_cpg.lcrso service_confdb.lcrso service_pload.lcrso service_votequorum.lcrso service_testquorum.lcrso
+LCRSO			= service_evs.lcrso service_cfg.lcrso service_cpg.lcrso service_confdb.lcrso service_pload.lcrso quorum_votequorum.lcrso quorum_testquorum.lcrso
 
 if BUILD_DARWIN
+quorum_%.lcrso: %.o
+	$(CC) $(CFLAGS) -bundle -bundle_loader ../exec/corosync $^ -o $@
+
 service_%.lcrso: %.o
 	$(CC) $(CFLAGS) -bundle -bundle_loader ../exec/corosync $^ -o $@
 else
+quorum_%.lcrso:
+	$(CC) $(CFLAGS) -shared -Wl,-soname,$@ $^ -o $@
+
 service_%.lcrso: %.o
 	$(CC) $(CFLAGS) -shared -Wl,-soname,$@ $^ -o $@
 endif
@@ -54,7 +60,7 @@ all-local: $(LCRSO)
 
 install-exec-local:
 	$(INSTALL) -d $(DESTDIR)/$(LCRSODIR)
-	$(INSTALL) -m 644 $(LCRSO) $(DESTDIR)/$(LCRSODIR)
+	$(INSTALL) -m 755 $(LCRSO) $(DESTDIR)/$(LCRSODIR)
 
 clean-local:
 	rm -f *.o *.a *.so* *.da *.bb *.bbg *.lcrso

tools/Makefile.am

@@ -32,8 +32,9 @@
 MAINTAINERCLEANFILES    = Makefile.in
 INCLUDES       		= -I$(top_builddir)/include  -I$(top_srcdir)/include
 
-noinst_PROGRAMS		= corosync-pload
-sbin_PROGRAMS		= corosync-fplay corosync-cfgtool corosync-keygen corosync-objctl 
+sbin_PROGRAMS		= corosync-fplay corosync-cfgtool \
+			  corosync-keygen corosync-objctl \
+			  corosync-pload
 
 corosync_pload_LDADD	= ../lib/libpload.a
 corosync_objctl_LDADD	= ../lib/libconfdb.a ../lcr/liblcr.a