Fix several search path configure options

[ganeti-local] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 375ec52..d00379d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -538,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 \
@@ -1793,15 +1794,15 @@ src/AutoConf.hs: Makefile src/AutoConf.hs.in | stamp-directories
            -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)" \