This is the mail archive of the
cluster-cvs@sourceware.org
mailing list for the cluster.
cluster: master - build: add the option to install corosync headers
- From: "Fabio M. Di Nitto" <fabbione at fedoraproject dot org>
- To: cluster-cvs-relay at redhat dot com
- Date: Wed, 7 Jan 2009 15:14:41 +0000 (UTC)
- Subject: cluster: master - build: add the option to install corosync headers
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=4bfd7234d19e9c5d2d8e929713a8d65fad919c42
Commit: 4bfd7234d19e9c5d2d8e929713a8d65fad919c42
Parent: 1793c3e6f9b6971d1f1e7025304adf158e7b7d97
Author: Fabio M. Di Nitto <fdinitto@redhat.com>
AuthorDate: Wed Jan 7 16:13:07 2009 +0100
Committer: Fabio M. Di Nitto <fdinitto@redhat.com>
CommitterDate: Wed Jan 7 16:13:07 2009 +0100
build: add the option to install corosync headers
this is a bit of a special case but for now it will do fine.
COROSYNCINCDIRT=path_to_corosync_header will install the header
in the right location and it will not expect the normal header for that
library.
Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
---
cman/services/quorum/lib/Makefile | 2 ++
make/install.mk | 6 ++++++
make/libs.mk | 6 ++++--
make/uninstall.mk | 3 +++
4 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/cman/services/quorum/lib/Makefile b/cman/services/quorum/lib/Makefile
index 0049b86..8656b4a 100644
--- a/cman/services/quorum/lib/Makefile
+++ b/cman/services/quorum/lib/Makefile
@@ -1,5 +1,7 @@
TARGET= libcmanquorum
+COROSYNCINCDIRT=../include/corosync/cmanquorum.h
+
include ../../../../make/defines.mk
include $(OBJDIR)/make/libs.mk
include $(OBJDIR)/make/cobj.mk
diff --git a/make/install.mk b/make/install.mk
index 0277bc2..79690e8 100644
--- a/make/install.mk
+++ b/make/install.mk
@@ -12,6 +12,12 @@ ifdef INCDIRT
install -m644 $(S)/$$i ${incdir}; \
done
endif
+ifdef COROSYNCINCDIRT
+ install -d ${DESTDIR}/${corosyncincdir}/corosync
+ for i in ${COROSYNCINCDIRT}; do \
+ install -m644 $(S)/$$i ${DESTDIR}/${corosyncincdir}/corosync; \
+ done
+endif
ifdef SBINDIRT
install -d ${sbindir}
install -m755 ${SBINDIRT} ${sbindir}
diff --git a/make/libs.mk b/make/libs.mk
index cfe01c2..0835347 100644
--- a/make/libs.mk
+++ b/make/libs.mk
@@ -18,8 +18,10 @@ ifndef MAKESTATICLIB
LIBSYMT=$(TARGET).so \
$(TARGET).so.$(SOMAJOR)
endif
- ifndef INCDIRT
- INCDIRT=$(TARGET).h
+ ifndef COROSYNCINCDIRT
+ ifndef INCDIRT
+ INCDIRT=$(TARGET).h
+ endif
endif
ifndef SHAREDLIB
SHAREDLIB=$(TARGET).so.${SOMAJOR}.${SOMINOR}
diff --git a/make/uninstall.mk b/make/uninstall.mk
index aeaf60b..af5da73 100644
--- a/make/uninstall.mk
+++ b/make/uninstall.mk
@@ -5,6 +5,9 @@ endif
ifdef LIBSYMT
${UNINSTALL} ${LIBSYMT} ${libdir}
endif
+ifdef COROSYNCINCDIRT
+ @echo WARNING: need to fix uninstall for corosync headers
+endif
ifdef INCDIRT
${UNINSTALL} ${INCDIRT} ${incdir}
endif