35 lines
1.2 KiB
Diff
35 lines
1.2 KiB
Diff
diff --git a/Makefile b/Makefile
|
|
index 4297c8d..c463c0b 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -6,7 +6,7 @@
|
|
|
|
DEPCMD := $(shell if [ -f /usr/bin/dnf ]; then echo "dnf builddep"; else echo "yum-builddep"; fi)
|
|
|
|
-SUBDIRS := Common Client documentation Server LabController IntegrationTests
|
|
+SUBDIRS := Common Client documentation
|
|
|
|
.PHONY: build
|
|
build:
|
|
diff --git a/documentation/Makefile b/documentation/Makefile
|
|
index 60cf807..33411d0 100644
|
|
--- a/documentation/Makefile
|
|
+++ b/documentation/Makefile
|
|
@@ -2,7 +2,7 @@
|
|
#
|
|
|
|
SHELL = /bin/bash
|
|
-export PYTHONPATH=../Common:../Server:../Client/src
|
|
+export PYTHONPATH=../Common::../Client/src
|
|
SPHINXBUILD ?= $(firstword $(shell command -v sphinx-1.0-build sphinx-build))
|
|
|
|
# This Makefile contains some frustrating hacks, centering around the fact that
|
|
@@ -30,7 +30,7 @@ SPHINXREQUIRES = "Sphinx >= 1.0",
|
|
ifeq (0,$(shell python2 -c '__requires__ = ["CherryPy < 3.0"]; import pkg_resources' &>/dev/null ; echo $$?))
|
|
SPHINXREQUIRES += "CherryPy < 3.0",
|
|
endif
|
|
-BKR_PATH_INJECTED = "../Common/bkr", "../Server/bkr", "../Client/src/bkr"
|
|
+BKR_PATH_INJECTED = "../Common/bkr", "../Client/src/bkr"
|
|
|
|
# You can set these variables from the command line.
|
|
SPHINXOPTS =
|