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

[Andrew Beekhof]

On 02/04/2013, at 10:22 PM, Andrei Belov <defanator at gmail.com> wrote:

> 
> 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.

Technically a non-standard prefix makes them no longer OCF compliant.
But I have applied it anyway.

> ---
> 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
> 
> _______________________________________________
> Pacemaker mailing list: Pacemaker at oss.clusterlabs.org
> http://oss.clusterlabs.org/mailman/listinfo/pacemaker
> 
> Project Home: http://www.clusterlabs.org
> Getting started: http://www.clusterlabs.org/doc/Cluster_from_Scratch.pdf
> Bugs: http://bugs.clusterlabs.org