Browse Source

[1454] Fix distcheck

There was a problem with placing the unix domain socket, it wanted to
put it into the source directory.
Michal 'vorner' Vaner 13 years ago
parent
commit
aa74005fd2
2 changed files with 7 additions and 0 deletions
  1. 6 0
      src/bin/ddns/ddns.py.in
  2. 1 0
      src/bin/ddns/tests/Makefile.am

+ 6 - 0
src/bin/ddns/ddns.py.in

@@ -43,6 +43,12 @@ DATA_PATH = bind10_config.DATA_PATH
 SOCKET_FILE = DATA_PATH + '/ddns_socket'
 SOCKET_FILE = DATA_PATH + '/ddns_socket'
 if "B10_FROM_SOURCE" in os.environ:
 if "B10_FROM_SOURCE" in os.environ:
     DATA_PATH = os.environ['B10_FROM_SOURCE'] + "/src/bin/ddns"
     DATA_PATH = os.environ['B10_FROM_SOURCE'] + "/src/bin/ddns"
+if "B10_FROM_BUILD" in os.environ:
+    if "B10_FROM_SOURCE_LOCALSTATEDIR" in os.environ:
+        SOCKET_FILE = os.environ["B10_FROM_SOURCE_LOCALSTATEDIR"] + \
+            "/ddns_socket"
+    else:
+        SOCKET_FILE = os.environ["B10_FROM_BUILD"] + "/ddns_socket"
 SPECFILE_LOCATION = DATA_PATH + "/ddns.spec"
 SPECFILE_LOCATION = DATA_PATH + "/ddns.spec"
 
 
 
 

+ 1 - 0
src/bin/ddns/tests/Makefile.am

@@ -21,6 +21,7 @@ endif
 	for pytest in $(PYTESTS) ; do \
 	for pytest in $(PYTESTS) ; do \
 	echo Running test: $$pytest ; \
 	echo Running test: $$pytest ; \
 	B10_FROM_SOURCE=$(abs_top_srcdir) \
 	B10_FROM_SOURCE=$(abs_top_srcdir) \
+	B10_FROM_BUILD=$(abs_top_builddir) \
 	$(LIBRARY_PATH_PLACEHOLDER) \
 	$(LIBRARY_PATH_PLACEHOLDER) \
 	PYTHONPATH=$(COMMON_PYTHON_PATH):$(abs_top_builddir)/src/bin/ddns:$(abs_top_builddir)/src/lib/dns/python/.libs:$(abs_top_builddir)/src/lib/util/io/.libs \
 	PYTHONPATH=$(COMMON_PYTHON_PATH):$(abs_top_builddir)/src/bin/ddns:$(abs_top_builddir)/src/lib/dns/python/.libs:$(abs_top_builddir)/src/lib/util/io/.libs \
 	TESTDATASRCDIR=$(abs_srcdir)/testdata/ \
 	TESTDATASRCDIR=$(abs_srcdir)/testdata/ \