Fix several search path configure options

[ganeti-local] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 4ad1016..d00379d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -509,6 +509,8 @@ docinput = \
        doc/design-device-uuid-name.rst \
        doc/design-draft.rst \
        doc/design-hotplug.rst \
+       doc/design-glusterfs-ganeti-support.rst \
+       doc/design-daemons.rst \
        doc/design-htools-2.3.rst \
        doc/design-http-server.rst \
        doc/design-impexp2.rst \
@@ -519,6 +521,7 @@ docinput = \
        doc/design-network.rst \
        doc/design-node-add.rst \
        doc/design-oob.rst \
+       doc/design-openvswitch.rst \
        doc/design-ovf-support.rst \
        doc/design-opportunistic-locking.rst \
        doc/design-optables.rst \
@@ -535,6 +538,7 @@ docinput = \
        doc/design-hroller.rst \
        doc/design-storagetypes.rst \
         doc/design-upgrade.rst \
+       doc/design-hsqueeze.rst \
        doc/devnotes.rst \
        doc/glossary.rst \
        doc/hooks.rst \
@@ -734,6 +738,7 @@ HS_TEST_SRCS = \
        test/hs/Test/Ganeti/HTools/CLI.hs \
        test/hs/Test/Ganeti/HTools/Cluster.hs \
        test/hs/Test/Ganeti/HTools/Container.hs \
+       test/hs/Test/Ganeti/HTools/ExtLoader.hs \
        test/hs/Test/Ganeti/HTools/Graph.hs \
        test/hs/Test/Ganeti/HTools/Instance.hs \
        test/hs/Test/Ganeti/HTools/Loader.hs \
@@ -1452,6 +1457,7 @@ python_tests = \
        test/py/ganeti.utils.retry_unittest.py \
        test/py/ganeti.utils.storage_unittest.py \
        test/py/ganeti.utils.text_unittest.py \
+       test/py/ganeti.utils.version_unittest.py \
        test/py/ganeti.utils.wrapper_unittest.py \
        test/py/ganeti.utils.x509_unittest.py \
        test/py/ganeti.utils_unittest.py \
@@ -1739,8 +1745,8 @@ src/Ganeti/Hs2Py/ListConstants.hs: src/Ganeti/Hs2Py/ListConstants.hs.in \
 ##   adminstDown = ...
 ## becomes
 ##   'adminstDown
-       NAMES=$$(sed -n -e "/=/ s/\(.*\) =.*/    '\1:/g p" \
-                $(abs_top_srcdir)/src/Ganeti/HsConstants.hs); \
+       NAMES=$$(sed -e "/^--/ d" $(abs_top_srcdir)/src/Ganeti/HsConstants.hs |\
+                sed -n -e "/=/ s/\(.*\) =.*/    '\1:/g p"); \
        m4 -DPY_CONSTANT_NAMES="$$NAMES" $(abs_top_srcdir)/$< > $@
 
 src/Ganeti/PyConstants.hs: src/Ganeti/PyConstants.hs.in \
@@ -1781,21 +1787,22 @@ src/AutoConf.hs: Makefile src/AutoConf.hs.in | stamp-directories
            -DVERSION_REVISION="$(VERSION_REVISION)" \
            -DVERSION_SUFFIX="$(VERSION_SUFFIX)" \
            -DVERSION_FULL="$(VERSION_FULL)" \
+           -DDIRVERSION="$(DIRVERSION)" \
            -DLOCALSTATEDIR="$(localstatedir)" \
            -DSYSCONFDIR="$(sysconfdir)" \
            -DSSH_CONFIG_DIR="$(SSH_CONFIG_DIR)" \
            -DSSH_LOGIN_USER="$(SSH_LOGIN_USER)" \
            -DSSH_CONSOLE_USER="$(SSH_CONSOLE_USER)" \
            -DEXPORT_DIR="$(EXPORT_DIR)" \
-           -DOS_SEARCH_PATH="$(foreach i,$(OS_SEARCH_PATH),\"$(i)\":)" \
-           -DES_SEARCH_PATH="$(foreach i,$(ES_SEARCH_PATH),\"$(i)\":)" \
+           -DOS_SEARCH_PATH="\"$(OS_SEARCH_PATH)\"" \
+           -DES_SEARCH_PATH="\"$(ES_SEARCH_PATH)\"" \
            -DXEN_BOOTLOADER="$(XEN_BOOTLOADER)" \
            -DXEN_CONFIG_DIR="$(XEN_CONFIG_DIR)" \
            -DXEN_KERNEL="$(XEN_KERNEL)" \
            -DXEN_INITRD="$(XEN_INITRD)" \
            -DKVM_KERNEL="$(KVM_KERNEL)" \
            -DSHARED_FILE_STORAGE_DIR="$(SHARED_FILE_STORAGE_DIR)" \
-           -DIALLOCATOR_SEARCH_PATH="$(foreach i,$(IALLOCATOR_SEARCH_PATH),\"$(i)\":)" \
+           -DIALLOCATOR_SEARCH_PATH="\"$(IALLOCATOR_SEARCH_PATH)\"" \
            -DKVM_PATH="$(KVM_PATH)" \
            -DIP_PATH="$(IP_PATH)" \
            -DSOCAT_PATH="$(SOCAT)" \
@@ -1806,6 +1813,7 @@ src/AutoConf.hs: Makefile src/AutoConf.hs.in | stamp-directories
            -DGNT_SCRIPTS="$(foreach i,$(notdir $(gnt_scripts)),\"$(i)\":)" \
            -DHS_HTOOLS_PROGS="$(foreach i,$(HS_HTOOLS_PROGS),\"$(i)\":)" \
            -DPKGLIBDIR="$(libdir)/ganeti" \
+           -DSHAREDIR="$(prefix)/share/ganeti" \
            -DVERSIONEDSHAREDIR="$(versionedsharedir)" \
            -DDRBD_BARRIERS="$(DRBD_BARRIERS)" \
            -DDRBD_NO_META_FLUSH="$(DRBD_NO_META_FLUSH)" \
@@ -1832,6 +1840,7 @@ src/AutoConf.hs: Makefile src/AutoConf.hs.in | stamp-directories
            -DENABLE_SPLIT_QUERY="$(ENABLE_SPLIT_QUERY)" \
            -DENABLE_RESTRICTED_COMMANDS="$(ENABLE_RESTRICTED_COMMANDS)" \
            -DENABLE_MOND="$(ENABLE_MOND)" \
+           -DHAS_GNU_LN="$(HAS_GNU_LN)" \
            -DMAN_PAGES="$$(for i in $(notdir $(man_MANS)); do \
                            echo -n "$$i" | sed -re 's/^(.*)\.([0-9]+)$$/("\1",\2):/g'; \
                            done)" \
@@ -2086,6 +2095,7 @@ hs-check: hs-tests hs-shell
 #       (since our indent level is not 4)
 # E125: continuation line does not distinguish itself from next logical line
 #       (since our indent level is not 4)
+# E123: closing bracket does not match indentation of opening bracket's line
 # E127: continuation line over-indented for visual indent
 #       (since our indent level is not 4)
 # note: do NOT add E128 here; it's a valid style error in most cases!
@@ -2094,7 +2104,7 @@ hs-check: hs-tests hs-shell
 # instead of silencing it
 # E261: at least two spaces before inline comment
 # E501: line too long (80 characters)
-PEP8_IGNORE = E111,E121,E125,E127,E261,E501
+PEP8_IGNORE = E111,E121,E123,E125,E127,E261,E501
 
 # For excluding pep8 expects filenames only, not whole paths
 PEP8_EXCLUDE = $(subst $(space),$(comma),$(strip $(notdir $(BUILT_PYTHON_SOURCES))))