diff --git a/Makefile b/Makefile index 555bded8..8ac46059 100644 --- a/Makefile +++ b/Makefile @@ -45,7 +45,6 @@ INCLUDEDIR_LCR=$(PREFIX)/include/openais/lcr INCLUDEDIR_SERVICE=$(PREFIX)/include/openais/service MANDIR=$(PREFIX)/share/man ETCDIR=/etc -LCRSODIR=$(PREFIX)/libexec/lcrso ARCH=$(shell uname -p) ifeq (,$(findstring 64,$(ARCH))) diff --git a/Makefile.inc b/Makefile.inc index a2ba6294..84b329a7 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -1,6 +1,7 @@ # Common options PREFIX=/usr DESTDIR= +LCRSODIR=$(PREFIX)/libexec/lcrso # Do not modify below this line diff --git a/lcr/Makefile b/lcr/Makefile index 1df1ab9e..2f4ba402 100755 --- a/lcr/Makefile +++ b/lcr/Makefile @@ -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) diff --git a/lcr/lcr_ifact.c b/lcr/lcr_ifact.c index b2351037..4a57e3d6 100644 --- a/lcr/lcr_ifact.c +++ b/lcr/lcr_ifact.c @@ -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)