From: Sapan Bhatia <sapanb@cs.princeton.edu>
Date: Fri, 12 Oct 2007 20:03:12 +0000 (+0000)
Subject: Build fix.
X-Git-Tag: vsys-0.7-19~15
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=e1f16114869433beafc069131ff59e181ef6b8ee;p=vsys.git

Build fix.
---

diff --git a/Makefile b/Makefile
index d05d91f..90b6585 100644
--- a/Makefile
+++ b/Makefile
@@ -37,9 +37,8 @@ vsys.b: inotify.cma inotify.cmi globals.ml fdwatcher.ml dirwatcher.ml fifowatche
 	ocamlc -g str.cma unix.cma inotify.cma globals.cmo fdwatcher.cmo dirwatcher.cmo fifowatcher.cmo frontend.cmo backend.cmo str.cma main.cmo -o vsys.b
 
 install: vsys
-	cp vsys /usr/bin
-	cp vsys.b /usr/bin
-	cp vsys-initscript /etc/init.d/vsys 
+	cp vsys $(INSTALL_DIR)/usr/bin
+	cp vsys-initscript $(INSTALL_DIR)/etc/init.d/vsys 
 
 dep:
 	ocamldep *.ml > .dep
diff --git a/vsys.spec b/vsys.spec
index 95fc555..c13a8d9 100644
--- a/vsys.spec
+++ b/vsys.spec
@@ -40,7 +40,11 @@ rm -rf $RPM_BUILD_ROOT
 make
 
 %install
-make install
+mkdir -p ${VSYS_INSTALL_DIR}/usr/bin
+cp vsys ${VSYS_INSTALL_DIR}/usr/bin
+cp vsys.b ${VSYS_INSTALL_DIR}/usr/bin
+cp vsys-initscript ${VSYS_INSTALL_DIR}/etc/init.d/vsys
+make -DVSYS_BIN_DIR=$RPM_BUILD_ROOT install
 
 %clean
 rm -rf $RPM_BUILD_ROOT