X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=python%2Fovs%2Fautomake.mk;h=224732809f1fac948c57ab77fd0ae7a7e79fc06b;hb=859ad376132e1eb13d0a1a28cae2c477300fd45f;hp=5c10c2a91d5889942ec11d97a9c03698c03873d2;hpb=991559357f6a03c3a5b70c053c8c2554aa8d5ee4;p=openvswitch

diff --git a/python/ovs/automake.mk b/python/ovs/automake.mk
index 5c10c2a9..22473280 100644
--- a/python/ovs/automake.mk
+++ b/python/ovs/automake.mk
@@ -20,6 +20,7 @@ ovs_pyfiles = \
 	python/ovs/socket_util.py \
 	python/ovs/stream.py \
 	python/ovs/timeval.py \
+	python/ovs/vlog.py \
 	python/ovs/util.py
 EXTRA_DIST += $(ovs_pyfiles) python/ovs/dirs.py
 
@@ -27,16 +28,21 @@ if HAVE_PYTHON
 nobase_pkgdata_DATA = $(ovs_pyfiles)
 ovs-install-data-local:
 	$(MKDIR_P) python/ovs
-	(echo 'PKGDATADIR = """$(pkgdatadir)"""' && \
-	 echo 'RUNDIR = """@RUNDIR@"""' && \
-	 echo 'LOGDIR = """@LOGDIR@"""' && \
-	 echo 'BINDIR = """$(bindir)"""') > python/ovs/dirs.py.tmp
+	(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)""")') \
+		> python/ovs/dirs.py.tmp
 	$(MKDIR_P) $(DESTDIR)$(pkgdatadir)/python/ovs
 	$(INSTALL_DATA) python/ovs/dirs.py.tmp $(DESTDIR)$(pkgdatadir)/python/ovs/dirs.py
 	rm python/ovs/dirs.py.tmp
+else
+ovs-install-data-local:
+	@:
 endif
 install-data-local: ovs-install-data-local
 
-uninstall-local: ovs-uninstall-local
+UNINSTALL_LOCAL += ovs-uninstall-local
 ovs-uninstall-local:
 	rm -f $(DESTDIR)$(pkgdatadir)/python/ovs/dirs.py