From bea603817898379c9bb3a2379afeaa3a3f80bc49 Mon Sep 17 00:00:00 2001
From: Michael Hanselmann <hansmi@google.com>
Date: Mon, 24 Aug 2009 11:10:11 +0200
Subject: [PATCH] Add tools directory to constants

Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
---
 Makefile.am      | 3 ++-
 lib/constants.py | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index 56e70fb24..d9422ffb1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -330,7 +330,8 @@ lib/_autoconf.py: Makefile stamp-directories
 	  echo "KVM_PATH = '$(KVM_PATH)'"; \
 	  echo "KVM_MIGRATION_PORT = '$(KVM_MIGRATION_PORT)'"; \
 	  echo "SOCAT_PATH = '$(SOCAT_PATH)'"; \
-	  echo "LVM_STRIPECOUNT = $(LVM_STRIPECOUNT)" ; \
+	  echo "LVM_STRIPECOUNT = $(LVM_STRIPECOUNT)"; \
+	  echo "TOOLSDIR = '$(toolsdir)'"; \
 	} > $@
 
 $(REPLACE_VARS_SED): Makefile stamp-directories
diff --git a/lib/constants.py b/lib/constants.py
index 03ed03dd1..7d3796cfa 100644
--- a/lib/constants.py
+++ b/lib/constants.py
@@ -106,6 +106,7 @@ QUEUE_DIR = DATA_DIR + "/queue"
 ETC_HOSTS = "/etc/hosts"
 DEFAULT_FILE_STORAGE_DIR = _autoconf.FILE_STORAGE_DIR
 SYSCONFDIR = _autoconf.SYSCONFDIR
+TOOLSDIR = _autoconf.TOOLSDIR
 CONF_DIR = SYSCONFDIR + "/ganeti"
 
 MASTER_SOCKET = SOCKET_DIR + "/ganeti-master"
-- 
GitLab