Hs2Py constants: add 'confd' related constants

[ganeti-local] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 4ffeecc..609d956 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1058,16 +1058,19 @@ python_scripts = \
        tools/sanitize-config
 
 dist_tools_SCRIPTS = \
-       $(python_scripts) \
-       tools/burnin \
        tools/kvm-console-wrapper \
        tools/master-ip-setup \
        tools/xen-console-wrapper
 
+dist_tools_python_SCRIPTS = \
+       $(python_scripts) \
+       tools/burnin
+
 nodist_tools_python_SCRIPTS = \
        tools/node-cleanup
 
-tools_python_basenames = $(patsubst tools/%,%,$(nodist_tools_python_SCRIPTS))
+tools_python_basenames = $(patsubst tools/%,%,\
+       $(dist_tools_python_SCRIPTS) $(nodist_tools_python_SCRIPTS))
 
 nodist_tools_SCRIPTS = \
        tools/users-setup \
@@ -1801,6 +1804,7 @@ lib/_autoconf.py: Makefile | stamp-directories
          echo "GNT_SCRIPTS = [$(foreach i,$(notdir $(gnt_scripts)),'$(i)',)]"; \
          echo "HTOOLS_PROGS = [$(foreach i,$(HS_HTOOLS_PROGS),'$(i)',)]"; \
          echo "PKGLIBDIR = '$(libdir)/ganeti'"; \
+         echo "VERSIONEDSHAREDIR = '$(versionedsharedir)'"; \
          echo "DRBD_BARRIERS = '$(DRBD_BARRIERS)'"; \
          echo "DRBD_NO_META_FLUSH = $(DRBD_NO_META_FLUSH)"; \
          echo "SYSLOG_USAGE = '$(SYSLOG_USAGE)'"; \
@@ -1875,6 +1879,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" \
+           -DVERSIONEDSHAREDIR="$(versionedsharedir)" \
            -DDRBD_BARRIERS="$(DRBD_BARRIERS)" \
            -DDRBD_NO_META_FLUSH="$(DRBD_NO_META_FLUSH)" \
            -DSYSLOG_USAGE="$(SYSLOG_USAGE)" \