[Pacemaker] [PATCH] Use correct OCF_ROOT_DIR in include/crm/services.h.

Andrei Belov defanator at gmail.com
Tue Apr 2 11:22:06 UTC 2013


Previously, libcrmservice always has OCF_ROOT_DIR defined as "/usr/lib/ocf",
despite the fact that another path was defined in glue_config.h.

Caught on SunOS 5.11 while configuring cluster-glue and pacemaker using
non-standard prefix.
---
 lib/services/Makefile.am |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/services/Makefile.am b/lib/services/Makefile.am
index 3ee3347..8d44dad 100644
--- a/lib/services/Makefile.am
+++ b/lib/services/Makefile.am
@@ -25,7 +25,7 @@ noinst_HEADERS  = upstart.h systemd.h services_private.h
 
 libcrmservice_la_SOURCES = services.c services_linux.c
 libcrmservice_la_LDFLAGS = -version-info 1:0:0
-libcrmservice_la_CFLAGS  = $(GIO_CFLAGS)
+libcrmservice_la_CFLAGS  = -DOCF_ROOT_DIR=\"@OCF_ROOT_DIR@\" $(GIO_CFLAGS)
 libcrmservice_la_LIBADD   = $(GIO_LIBS)
 
 if BUILD_UPSTART

-- 
Andrei




More information about the Pacemaker mailing list