From 07b0ad16566c5a4ae8629e3a0cdee1d60c93594b Mon Sep 17 00:00:00 2001 From: Sapan Bhatia Date: Wed, 6 Aug 2008 17:51:17 +0000 Subject: [PATCH] copy files from factory->factory/exec, from where they are installed --- Makefile | 7 +++---- factory/Makefile | 2 ++ vsys.spec | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index d68413c..a79ff35 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -all: vsys factory-exec/* +all: vsys factory/.done include .dep @@ -39,11 +39,10 @@ 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-exec/%: factory/% +factory/.done: factory/* $(MAKE) -C factory/ - cp -fR factory/ factory-exec -install: vsys factory +install: vsys factory/.done cp vsys $(INSTALL_DIR)/usr/bin cp vsys-initscript $(INSTALL_DIR)/etc/init.d/vsys cp -fR factory/ factory-exec/ diff --git a/factory/Makefile b/factory/Makefile index 22ff5b5..20e4b76 100644 --- a/factory/Makefile +++ b/factory/Makefile @@ -2,3 +2,5 @@ CC=gcc CFLAGS=-g -O2 all: dcookie + +clean: rm -f exec/* diff --git a/vsys.spec b/vsys.spec index e737b24..6611449 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-exec/* $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 -- 2.43.0