Explorar el Código

Allow override of the LCRSO directory from the Makefiles or command line

git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@1458 fd59a12c-fef9-0310-b244-a6a79926bd2f
Steven Dake hace 18 años
padre
commit
fc1a08d411
Se han modificado 4 ficheros con 3 adiciones y 3 borrados
  1. 0 1
      Makefile
  2. 1 0
      Makefile.inc
  3. 1 1
      lcr/Makefile
  4. 1 1
      lcr/lcr_ifact.c

+ 0 - 1
Makefile

@@ -45,7 +45,6 @@ INCLUDEDIR_LCR=$(PREFIX)/include/openais/lcr
 INCLUDEDIR_SERVICE=$(PREFIX)/include/openais/service
 INCLUDEDIR_SERVICE=$(PREFIX)/include/openais/service
 MANDIR=$(PREFIX)/share/man
 MANDIR=$(PREFIX)/share/man
 ETCDIR=/etc
 ETCDIR=/etc
-LCRSODIR=$(PREFIX)/libexec/lcrso
 ARCH=$(shell uname -p)
 ARCH=$(shell uname -p)
 
 
 ifeq (,$(findstring 64,$(ARCH)))
 ifeq (,$(findstring 64,$(ARCH)))

+ 1 - 0
Makefile.inc

@@ -1,6 +1,7 @@
 # Common options
 # Common options
 PREFIX=/usr
 PREFIX=/usr
 DESTDIR=
 DESTDIR=
+LCRSODIR=$(PREFIX)/libexec/lcrso
 
 
 # Do not modify below this line
 # Do not modify below this line
 
 

+ 1 - 1
lcr/Makefile

@@ -26,7 +26,7 @@
 #
 #
 include ../Makefile.inc
 include ../Makefile.inc
 
 
-override CFLAGS += -I../include -DPREFIX='"$(PREFIX)"'
+override CFLAGS += -I../include -DLCRSODIR='"$(LCRSODIR)"'
 override LDFLAGS += -L./ ${DYFLAGS}
 override LDFLAGS += -L./ ${DYFLAGS}
 
 
 ifeq (${OPENAIS_COMPAT}, LINUX) 
 ifeq (${OPENAIS_COMPAT}, LINUX) 

+ 1 - 1
lcr/lcr_ifact.c

@@ -179,7 +179,7 @@ static void defaults_path_build (void)
 		path_list_entries++;
 		path_list_entries++;
 	}
 	}
 	
 	
-	path_list[path_list_entries++] = PREFIX"/libexec/lcrso";
+	path_list[path_list_entries++] = LCRSODIR;
 }
 }
 
 
 static void ld_library_path_build (void)
 static void ld_library_path_build (void)