Improve OCF dir support

Add --with-ocfdir configurable option.
Fix superfluous /usr in ocf_scriptdir instalation path.

diff --git a/WHATS_NEW b/WHATS_NEW
index eaca69890de0b45f71301cce311b679bf648d22c..07839c8b5d49ebc61892ce9b026c039320553e4e 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,7 @@
 Version 2.02.80 - 
 ====================================
+  Fix superfluous /usr in ocf_scriptdir instalation path.
+  Add --with-ocfdir configurable option.
   Add aclocal.m4 (for pkgconfig).
   Fix memory leak in filter creation error path.
   Add missing tests in _setup_task().

diff --git a/configure.in b/configure.in
index 6cb5e8dbeedd0f6980b1270553ca62ea4b37bcfd..b58a6bac8eee2a07eb9423217fa0fead168adffb 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -368,6 +368,10 @@ AC_ARG_ENABLE(ocf,
                             [enable Open Cluster Framework (OCF) compliant resource agents]),
              OCF=$enableval, OCF=no)
 AC_MSG_RESULT($OCF)
+AC_ARG_WITH(ocfdir,
+           AC_HELP_STRING([--with-ocfdir=DIR],
+                          [install OCF files in DIR [[PREFIX/lib/ocf/resource.d/lvm2]]]),
+           OCFDIR=$withval, OCFDIR='${prefix}/lib/ocf/resource.d/lvm2')
 
 ################################################################################
 dnl -- Init pkg-config with dummy invokation:
@@ -1328,6 +1332,7 @@ AC_SUBST(LVM_RELEASE)
 AC_SUBST(LVM_RELEASE_DATE)
 AC_SUBST(MIRRORS)
 AC_SUBST(OCF)
+AC_SUBST(OCFDIR)
 AC_SUBST(REPLICATORS)
 AC_SUBST(MSGFMT)
 AC_SUBST(PKGCONFIG)

diff --git a/make.tmpl.in b/make.tmpl.in
index 806f77aac0090e78d51e1073e34f8d2b42599521..48fd617778c4917a2ac64bf9a29fb1e824db5b19 100644 (file)
--- a/make.tmpl.in
+++ b/make.tmpl.in
@@ -65,7 +65,7 @@ staticdir = $(DESTDIR)@STATICDIR@
 udevdir = $(DESTDIR)@udevdir@
 pkgconfigdir = $(usrlibdir)/pkgconfig
 initdir = $(DESTDIR)@sysconfdir@/rc.d/init.d
-ocf_scriptdir = $(DESTDIR)@prefix@/usr/lib/ocf/resource.d/lvm2
+ocf_scriptdir = $(DESTDIR)@OCFDIR@
 
 USRLIB_RELPATH = $(shell echo $(abspath $(usrlibdir) $(libdir)) | \
   $(AWK) -f $(top_srcdir)/scripts/relpath.awk)