[Openais] [patch 1/1] Make sure that all paths to lcrso are
consistent and centrally defined
beekhof at gmail.com
beekhof at gmail.com
Mon Sep 24 06:37:22 PDT 2007
Handy when building on platforms that dont have a libexec directory.
---
Makefile | 1 -
Makefile.inc | 1 +
lcr/Makefile | 2 +-
lcr/lcr_ifact.c | 2 +-
4 files changed, 3 insertions(+), 3 deletions(-)
Index: Makefile
===================================================================
--- Makefile.orig 2007-09-19 08:44:32.000000000 +0200
+++ Makefile 2007-09-24 15:24:21.000000000 +0200
@@ -38,7 +38,6 @@ INCLUDEDIR_LCR=$(PREFIX)/include/openais
INCLUDEDIR_SERVICE=$(PREFIX)/include/openais/service
MANDIR=$(PREFIX)/share/man
ETCDIR=/etc
-LCRSODIR=$(PREFIX)/libexec/lcrso
ARCH=$(shell uname -p)
ifeq (,$(findstring 64,$(ARCH)))
Index: Makefile.inc
===================================================================
--- Makefile.inc.orig 2007-09-17 14:52:34.000000000 +0200
+++ Makefile.inc 2007-09-24 15:24:50.000000000 +0200
@@ -1,6 +1,7 @@
# Common options
PREFIX=/usr
DESTDIR=
+LCRSODIR=$(PREFIX)/libexec/lcrso
# Do not modify below this line
Index: lcr/Makefile
===================================================================
--- lcr/Makefile.orig 2007-09-17 14:52:33.000000000 +0200
+++ lcr/Makefile 2007-09-24 15:25:15.000000000 +0200
@@ -26,7 +26,7 @@
#
include ../Makefile.inc
-override CFLAGS += -I../include -DPREFIX='"$(PREFIX)"'
+override CFLAGS += -I../include -DLCRSODIR='"$(LCRSODIR)"'
override LDFLAGS += -L./ ${DYFLAGS}
ifeq (${OPENAIS_COMPAT}, LINUX)
Index: lcr/lcr_ifact.c
===================================================================
--- lcr/lcr_ifact.c.orig 2007-09-17 14:52:33.000000000 +0200
+++ lcr/lcr_ifact.c 2007-09-24 15:25:30.000000000 +0200
@@ -179,7 +179,7 @@ static void defaults_path_build (void)
path_list_entries++;
}
- path_list[path_list_entries++] = PREFIX"/libexec/lcrso";
+ path_list[path_list_entries++] = LCRSODIR;
}
static void ld_library_path_build (void)
--
More information about the Openais
mailing list