From: Sapan Bhatia <sapanb@cs.princeton.edu>
Date: Wed, 6 Aug 2008 16:42:58 +0000 (+0000)
Subject: Making room for vsys entries implemented in C.
X-Git-Tag: vsys-0.8-0~7
X-Git-Url: http://git.onelab.eu/?p=vsys.git;a=commitdiff_plain;h=bf5e376eeb3b8092c7f54d608be81caccb48fdab

Making room for vsys entries implemented in C.
---

diff --git a/Makefile b/Makefile
index 41fcab5..c69ad6c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-all: vsys factory
+all: vsys factory-exec/*
 
 include .dep
 
@@ -39,8 +39,9 @@ vsys: ocaml_inotify-0.4/inotify.cmxa globals.cmx fdwatcher.cmx conffile.cmx spli
 vsys.b: ocaml_inotify-0.4/inotify.cma inotify.cmi globals.ml fdwatcher.ml dirwatcher.ml directfifowatcher.ml frontend.ml backend.ml main.ml
 	ocamlc -g str.cma unix.cma ocaml_inotify-0.4/inotify.cma globals.cmo fdwatcher.cmo dirwatcher.cmo directfifowatcher.cmo frontend.cmo backend.cmo str.cma conffile.cmo main.cmo -o vsys.b
 
-factory:
+factory-exec/%: factory/%
 	make -C factory/
+	cp -fR factory/ factory-exec
 
 install: vsys factory
 	cp vsys $(INSTALL_DIR)/usr/bin
diff --git a/vsys.spec b/vsys.spec
index 0842d54..e737b24 100644
--- a/vsys.spec
+++ b/vsys.spec
@@ -50,7 +50,7 @@ make
 mkdir -p $RPM_BUILD_ROOT/usr/bin
 mkdir -p $RPM_BUILD_ROOT/etc/init.d
 mkdir -p $RPM_BUILD_ROOT/vsys
-cp factory/* $RPM_BUILD_ROOT/vsys
+cp factory-exec/* $RPM_BUILD_ROOT/vsys
 cp vsys $RPM_BUILD_ROOT/usr/bin
 cp vsys-initscript $RPM_BUILD_ROOT/etc/init.d/vsys
 cp vsys.conf $RPM_BUILD_ROOT/etc