From 8e3507b53c5c48a45547593796ce3a3028c6d012 Mon Sep 17 00:00:00 2001 From: Vincent Bernardoff Date: Fri, 3 Jan 2014 12:06:34 +0100 Subject: [PATCH 1/2] run.local and run.opt.local are now compatible with OPAM usage. --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 3819fec6f..19095927a 100644 --- a/Makefile +++ b/Makefile @@ -21,10 +21,10 @@ doc: .PHONY: run.local run.opt.local top run.local: byte - CAML_LD_LIBRARY_PATH=src/server src/server/${PROJECTNAME} -c local/etc/${PROJECTNAME}.conf + CAML_LD_LIBRARY_PATH=src/server:$(CAML_LD_LIBRARY_PATH) src/server/${PROJECTNAME} -c local/etc/${PROJECTNAME}.conf run.opt.local: opt - CAML_LD_LIBRARY_PATH=src/server src/server/${PROJECTNAME}.opt -c local/etc/${PROJECTNAME}.conf + CAML_LD_LIBRARY_PATH=src/server:$(CAML_LD_LIBRARY_PATH) src/server/${PROJECTNAME}.opt -c local/etc/${PROJECTNAME}.conf top: cd src/server && ${MAKE} top From 98070612a3c99da46a5bc94472006d9d5cb1abfc Mon Sep 17 00:00:00 2001 From: Vincent Bernardoff Date: Fri, 3 Jan 2014 12:20:46 +0100 Subject: [PATCH 2/2] Create local/var/log and local/var/run as needed by ocsigenserver to run. --- src/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile b/src/Makefile index 4204fc7ec..261e35d53 100644 --- a/src/Makefile +++ b/src/Makefile @@ -64,7 +64,7 @@ confs: ../$(PROJECTNAME).conf.sample ../local/etc/${PROJECTNAME}.conf > $@ ../local/etc/$(PROJECTNAME).conf: files/${PROJECTNAME}.conf.in ../Makefile.config Makefile - mkdir -p ../local/etc + mkdir -p ../local/etc ../local/var/log ../local/var/run cat $< \ | sed s%80\%8080\%g \ | sed s%_LOGDIR_%$(SRC)/local/var/log%g \