DRBD: Fix another bug in diskless activation

[ganeti-local] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 599b547..5a25cf7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,22 @@
-# standard automake rules
+ACLOCAL_AMFLAGS = -I autotools
 
-SUBDIRS = man lib scripts daemons doc testing tools
+SUBDIRS = man lib scripts daemons doc test tools qa
+EXTRA_DIST = NEWS DEVNOTES
+
+.PHONY: ganeti
+ganeti:
+       cd $(top_builddir) && rm -f $@ && $(LN_S) lib $@
+
+pre-check: ganeti
+       $(MAKE) -C lib $@
+       $(MAKE) -C lib/rapi $@
+
+# a dist hook rule for catching revision control directories
+distcheck-hook:
+       if find $(top_distdir) | grep -F -e '.svn' -e '.git'; then \
+               echo "Found revision control files in final archive" 1>&2 ; \
+               exit 1; \
+       fi
 
 # custom rules
 depgraph: depgraph.png
@@ -16,4 +32,6 @@ depgraph.dot: ganeti/*.py
          --reports y --int-import-graph $@ --persistent n ganeti >/dev/null
 
 install-exec-local:
-       @mkdir_p@ ${localstatedir}/lib/ganeti ${localstatedir}/log/ganeti
+       @mkdir_p@ "$(DESTDIR)${localstatedir}/lib/ganeti" \
+         "$(DESTDIR)${localstatedir}/log/ganeti" \
+         "$(DESTDIR)${localstatedir}/run/ganeti"