make sliver-ovs use the configure variables

diff --git a/Makefile.am b/Makefile.am
index 932f495..887b1d7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -104,6 +104,7 @@ ro_shell = printf '\043 Generated automatically -- do not modify!    -*- buffer-
 
 SUFFIXES += .in
 .in:
+       @mkdir -p $$(dirname $@)
        $(PERL) $(srcdir)/build-aux/soexpand.pl -I$(srcdir) < $< | \
            sed \
                -e 's,[@]PKIDIR[@],$(PKIDIR),g' \

diff --git a/planetlab/automake.mk b/planetlab/automake.mk
index ccc4f7d..efccfa9 100644 (file)
--- a/planetlab/automake.mk
+++ b/planetlab/automake.mk
@@ -14,3 +14,6 @@ planetlab_pltap_ovs_pltap_ovs_SOURCES += planetlab/pltap-ovs/tunalloc.h
 
 planetlab_vsysc_vsysc_SOURCES =
 planetlab_vsysc_vsysc_SOURCES += planetlab/vsysc/vsysc.c
+
+EXTRA_DIST += \
+       planetlab/scripts/sliver-ovs.in

diff --git a/planetlab/scripts/sliver-ovs b/planetlab/scripts/sliver-ovs.in
similarity index 95%
rename from planetlab/scripts/sliver-ovs
rename to planetlab/scripts/sliver-ovs.in
index 87f173e..db6a2a6 100755 (executable)
--- a/planetlab/scripts/sliver-ovs
+++ b/planetlab/scripts/sliver-ovs.in
@@ -6,18 +6,18 @@
 COMMAND=$0
 
 #################### global vars
-RUN_DIR=/var/run/openvswitch
-DB_CONF_FILE=/etc/openvswitch/conf.db
-DB_SCHEMA=/usr/share/openvswitch/vswitch.ovsschema
-DB_PID_FILE=/var/run/openvswitch/db.pid
-DB_LOG=/var/log/ovs-db.log
+RUN_DIR=@RUNDIR@
+DB_CONF_FILE=@DBDIR@/conf.db
+DB_SCHEMA=@pkgdatadir@/vswitch.ovsschema
+DB_PID_FILE=$RUN_DIR/db.pid
+DB_LOG=@LOGDIR@/ovs-db.log
 DB_CTL_PATTERN='ovsdb-server.*.ctl'
 ##
-DB_SOCKET=/var/run/openvswitch/db.sock
+DB_SOCKET=$RUN_DIR/db.sock
 ##
-SWITCH_PID_FILE=/var/run/openvswitch/switch.pid
-SWITCH_LOG=/var/log/ovs-switch.log
-SWITCH_SOCKET=/var/run/openvswitch/switch.sock
+SWITCH_PID_FILE=$RUN_DIR/switch.pid
+SWITCH_LOG=@LOGDIR@/ovs-switch.log
+SWITCH_SOCKET=@RUNDIR@/switch.sock
 
 #################### helper functions