X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=python%2Fautomake.mk;h=c0f0db6b1f3f0761ef826725d31c298ceb9b4865;hb=HEAD;hp=b60e26b1bfabab8e30af8f6c2f5499d188f802fb;hpb=8a07709cb80462edb32fc11d056bfc08ce90f62d;p=sliver-openvswitch.git

diff --git a/python/automake.mk b/python/automake.mk
index b60e26b1b..c0f0db6b1 100644
--- a/python/automake.mk
+++ b/python/automake.mk
@@ -1,12 +1,12 @@
-run_python = PYTHONPATH=$(top_srcdir)/python:$$PYTHON_PATH $(PYTHON)
-
 ovstest_pyfiles = \
 	python/ovstest/__init__.py \
 	python/ovstest/args.py \
 	python/ovstest/rpcserver.py \
 	python/ovstest/tcp.py \
+	python/ovstest/tests.py \
 	python/ovstest/udp.py \
-	python/ovstest/util.py
+	python/ovstest/util.py \
+	python/ovstest/vswitch.py
 
 ovs_pyfiles = \
 	python/ovs/__init__.py \
@@ -28,7 +28,9 @@ ovs_pyfiles = \
 	python/ovs/socket_util.py \
 	python/ovs/stream.py \
 	python/ovs/timeval.py \
-	python/ovs/unixctl.py \
+	python/ovs/unixctl/__init__.py \
+	python/ovs/unixctl/client.py \
+	python/ovs/unixctl/server.py \
 	python/ovs/util.py \
 	python/ovs/version.py \
 	python/ovs/vlog.py
@@ -41,11 +43,15 @@ if HAVE_PYTHON
 nobase_pkgdata_DATA = $(ovs_pyfiles) $(ovstest_pyfiles)
 ovs-install-data-local:
 	$(MKDIR_P) python/ovs
-	(echo "import os" && \
-	 echo 'PKGDATADIR = os.environ.get("OVS_PKGDATADIR", """$(pkgdatadir)""")' && \
-	 echo 'RUNDIR = os.environ.get("OVS_RUNDIR", """@RUNDIR@""")' && \
-	 echo 'LOGDIR = os.environ.get("OVS_LOGDIR", """@LOGDIR@""")' && \
-	 echo 'BINDIR = os.environ.get("OVS_BINDIR", """$(bindir)""")') \
+	sed \
+		-e '/^##/d' \
+                -e 's,[@]pkgdatadir[@],$(pkgdatadir),g' \
+                -e 's,[@]RUNDIR[@],$(RUNDIR),g' \
+                -e 's,[@]LOGDIR[@],$(LOGDIR),g' \
+                -e 's,[@]bindir[@],$(bindir),g' \
+                -e 's,[@]sysconfdir[@],$(sysconfdir),g' \
+                -e 's,[@]DBDIR[@],$(DBDIR),g' \
+		< $(srcdir)/python/ovs/dirs.py.template \
 		> python/ovs/dirs.py.tmp
 	$(MKDIR_P) $(DESTDIR)$(pkgdatadir)/python/ovs
 	$(INSTALL_DATA) python/ovs/dirs.py.tmp $(DESTDIR)$(pkgdatadir)/python/ovs/dirs.py
@@ -65,3 +71,17 @@ $(srcdir)/python/ovs/version.py: config.status
 	$(ro_shell) > $(@F).tmp
 	echo 'VERSION = "$(VERSION)"' >> $(@F).tmp
 	if cmp -s $(@F).tmp $@; then touch $@; rm $(@F).tmp; else mv $(@F).tmp $@; fi
+
+ALL_LOCAL += $(srcdir)/python/ovs/dirs.py
+$(srcdir)/python/ovs/dirs.py: python/ovs/dirs.py.template
+	sed \
+		-e '/^##/d' \
+                -e 's,[@]pkgdatadir[@],/usr/local/share/openvswitch,g' \
+                -e 's,[@]RUNDIR[@],/var/run,g' \
+                -e 's,[@]LOGDIR[@],/usr/local/var/log,g' \
+                -e 's,[@]bindir[@],/usr/local/bin,g' \
+                -e 's,[@]sysconfdir[@],/usr/local/etc,g' \
+                -e 's,[@]DBDIR[@],/usr/local/etc/openvswitch,g' \
+		< $? > $@.tmp
+	mv $@.tmp $@
+EXTRA_DIST += python/ovs/dirs.py python/ovs/dirs.py.template