[1454] Fix distcheck

There was a problem with placing the unix domain socket, it wanted to
put it into the source directory.

diff --git a/src/bin/ddns/ddns.py.in b/src/bin/ddns/ddns.py.in
index 9485dfcd2d49c187f85821081ee71cb7204e3b3f..13855286bba4b0634b8cf3e76c0ef5a77bb5d3ff 100755 (executable)
--- a/src/bin/ddns/ddns.py.in
+++ b/src/bin/ddns/ddns.py.in
@@ -43,6 +43,12 @@ DATA_PATH = bind10_config.DATA_PATH
 SOCKET_FILE = DATA_PATH + '/ddns_socket'
 if "B10_FROM_SOURCE" in os.environ:
     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"
 
 

diff --git a/src/bin/ddns/tests/Makefile.am b/src/bin/ddns/tests/Makefile.am
index d8b1c794af92f3ac97f3ea88d5a55d78e69ac3ba..cd1082f069876ddc38d20f65d35533701a5ce048 100644 (file)
--- a/src/bin/ddns/tests/Makefile.am
+++ b/src/bin/ddns/tests/Makefile.am
@@ -21,6 +21,7 @@ endif
        for pytest in $(PYTESTS) ; do \
        echo Running test: $$pytest ; \
        B10_FROM_SOURCE=$(abs_top_srcdir) \
+       B10_FROM_BUILD=$(abs_top_builddir) \
        $(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 \
        TESTDATASRCDIR=$(abs_srcdir)/testdata/ \