Add logrotate example

[ganeti-local] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 7723893..819ffea 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -226,6 +226,7 @@ BUILT_EXAMPLES = \
        doc/examples/ganeti-kvm-poweroff.initd \
        doc/examples/ganeti.cron \
        doc/examples/ganeti.initd \
+       doc/examples/ganeti.logrotate \
        doc/examples/ganeti-master-role.ocf \
        doc/examples/ganeti-node-role.ocf \
        doc/examples/gnt-config-backup \
@@ -252,6 +253,7 @@ pkgpython_PYTHON = \
        lib/constants.py \
        lib/daemon.py \
        lib/errors.py \
+       lib/hooksmaster.py \
        lib/ht.py \
        lib/jqueue.py \
        lib/jstore.py \
@@ -425,7 +427,11 @@ mandocrst = $(addprefix doc/man-,$(notdir $(manrst)))
 HS_BIN_PROGS=src/htools
 
 # Haskell programs to be installed in the MYEXECLIB dir
+if ENABLE_MONITORING
 HS_MYEXECLIB_PROGS=src/mon-collector
+else
+HS_MYEXECLIB_PROGS=
+endif
 
 # Haskell programs to compiled but not installed automatically
 # Usually they have their own specific installation rules
@@ -967,6 +973,7 @@ TEST_FILES = \
        test/data/htools/hail-reloc-drbd.json \
        test/data/htools/hbal-excl-tags.data \
        test/data/htools/hbal-split-insts.data \
+       test/data/htools/hspace-tiered-ipolicy.data \
        test/data/htools/invalid-node.data \
        test/data/htools/missing-resources.data \
        test/data/htools/n1-failure.data \
@@ -1623,7 +1630,7 @@ check-local: check-dirs $(GENERATED_FILES)
        $(CHECK_PYTHON_CODE) $(check_python_code)
        PYTHONPATH=. $(CHECK_HEADER) $(check_python_code)
        $(CHECK_VERSION) $(VERSION) $(top_srcdir)/NEWS
-       $(CHECK_NEWS) < $(top_srcdir)/NEWS
+       RELEASE=$(PACKAGE_VERSION) $(CHECK_NEWS) < $(top_srcdir)/NEWS
        PYTHONPATH=. $(RUN_IN_TEMPDIR) $(CURDIR)/$(CHECK_IMPORTS) . $(standalone_python_modules)
        @expver=$(VERSION_MAJOR).$(VERSION_MINOR); \
        error= ; \
@@ -1764,18 +1771,12 @@ distcheck-hook:
          echo "Found empty files or directories in final archive." 1>&2; \
          exit 1; \
        fi
-       if test -n "$(BUILD_RELEASE)" && \
-          grep -n -H -E '^\*.*unreleased' $(top_distdir)/NEWS; then \
-          echo "Found unreleased version in NEWS." >&2; \
-          exit 1; \
-       fi
        if test -e $(top_distdir)/doc/man-html; then \
          echo "Found documentation including man pages in final archive" >&2; \
          exit 1; \
        fi
 
-# When building a release, stricter checks should be used
-distcheck-release dist-release: export BUILD_RELEASE = 1
+# Backwards compatible distcheck-release target
 distcheck-release: distcheck
 
 distrebuildcheck: dist