A few style fixes

[ganeti-local] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 3ea7e24..0beee68 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -55,6 +55,7 @@ CLEANFILES = \
        doc/examples/bash_completion \
        doc/examples/ganeti.initd \
        doc/examples/ganeti.cron \
+       doc/examples/hooks/ipsec \
        lib/*.py[co] \
        lib/http/*.py[co] \
        lib/hypervisor/*.py[co] \
@@ -200,6 +201,7 @@ EXTRA_DIST = \
        doc/examples/ganeti.cron.in \
        doc/examples/dumb-allocator \
        doc/examples/hooks/ethers \
+       doc/examples/hooks/ipsec.in \
        doc/locking.txt \
        test/testutils.py \
        test/mocks.py \
@@ -262,7 +264,8 @@ dist_TESTS = \
        test/ganeti.serializer_unittest.py \
        test/ganeti.ssh_unittest.py \
        test/ganeti.utils_unittest.py \
-       test/ganeti.workerpool_unittest.py
+       test/ganeti.workerpool_unittest.py \
+       test/docs_unittest.py
 
 nodist_TESTS =
 
@@ -274,7 +277,8 @@ TESTS_ENVIRONMENT = \
 
 all-local: stamp-directories devel/upload \
        doc/examples/bash_completion \
-       doc/examples/ganeti.initd doc/examples/ganeti.cron
+       doc/examples/ganeti.initd doc/examples/ganeti.cron \
+       doc/examples/hooks/ipsec
 
 devel/upload: devel/upload.in stamp-directories $(REPLACE_VARS_SED)
        sed -f $(REPLACE_VARS_SED) < $< > $@
@@ -289,6 +293,10 @@ doc/examples/%: doc/examples/%.in stamp-directories \
                $(REPLACE_VARS_SED)
        sed -f $(REPLACE_VARS_SED) < $< > $@
 
+doc/examples/hooks/%: doc/examples/hooks/%.in stamp-directories \
+               $(REPLACE_VARS_SED)
+       sed -f $(REPLACE_VARS_SED) < $< > $@
+
 doc/examples/bash_completion: $(BUILD_BASH_COMPLETION) $(RUN_IN_TEMPDIR) \
        lib/cli.py $(gnt_scripts) tools/burnin
        PYTHONPATH=. $(RUN_IN_TEMPDIR) $(CURDIR)/$(BUILD_BASH_COMPLETION) > $@
@@ -355,6 +363,7 @@ $(REPLACE_VARS_SED): Makefile stamp-directories
        { echo 's#@PREFIX@#$(prefix)#g'; \
          echo 's#@SYSCONFDIR@#$(sysconfdir)#g'; \
          echo 's#@LOCALSTATEDIR@#$(localstatedir)#g'; \
+         echo 's#@BINDIR@#$(bindir)#g'; \
          echo 's#@SBINDIR@#$(sbindir)#g'; \
          echo 's#@GANETI_VERSION@#$(PACKAGE_VERSION)#g'; \
          echo 's#@CUSTOM_XEN_KERNEL@#$(XEN_KERNEL)#g'; \