From 662b7943e3c203e73c1007b8f8e3748048b31de4 Mon Sep 17 00:00:00 2001
From: Gary Wong <gtw@cs.utah.edu>
Date: Thu, 9 Jul 2009 22:48:34 +0000
Subject: [PATCH] Omit the protogeni schemacheck on a boss-install-force.

---
 GNUmakefile.in               | 6 +++++-
 protogeni/GNUmakefile.in     | 5 ++++-
 protogeni/lib/GNUmakefile.in | 4 ++--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 2c852d024a..e7262547c8 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -51,7 +51,8 @@ install:
 # For installation on boss node
 # 
 boss-install:	install-schemacheck install-sitevarscheck install-dbfillcheck \
-		install-subdirs install-mkdirs install-setbuildinfo
+		install-genischemacheck install-subdirs install-mkdirs \
+		install-setbuildinfo
 	@echo "Boss node installed!"
 
 #
@@ -306,6 +307,9 @@ install-setbuildinfo:
 	@echo "Setting the Build and Version info"
 	$(SETBUILDINFO)
 
+install-genischemacheck:
+	@$(MAKE) -C protogeni install-genischemacheck
+
 # We use separate src and obj trees in Emulab, so the traditional distclean to
 # clean "made" files from a mingled source-and-obj tree is unnecessary.
 # However, this may be useful if you mistakenly configure and make a src tree.
diff --git a/protogeni/GNUmakefile.in b/protogeni/GNUmakefile.in
index b9bde959b4..22eb62b6d8 100644
--- a/protogeni/GNUmakefile.in
+++ b/protogeni/GNUmakefile.in
@@ -11,7 +11,7 @@ SUBDIR		= protogeni
 
 include $(OBJDIR)/Makeconf
 
-SUBDIRS	= security xmlrpc lib scripts etc 
+SUBDIRS	= security xmlrpc lib scripts etc
 
 all:	all-subdirs
 
@@ -24,6 +24,9 @@ install:
 	@$(MAKE) -C scripts install
 	@$(MAKE) -C etc install
 
+install-genischemacheck:
+	@$(MAKE) -C lib install-genischemacheck
+
 control-install: 
 
 # Clearinghouse install.
diff --git a/protogeni/lib/GNUmakefile.in b/protogeni/lib/GNUmakefile.in
index c2e2f41bf3..aae6d6b5ed 100644
--- a/protogeni/lib/GNUmakefile.in
+++ b/protogeni/lib/GNUmakefile.in
@@ -32,7 +32,7 @@ all:	$(LIB_SCRIPTS) $(SBIN_SCRIPTS) $(SCRIPTS)
 
 include $(TESTBED_SRCDIR)/GNUmakerules
 
-install: install-schemacheck $(addprefix $(INSTALL_LIBDIR)/, $(LIB_SCRIPTS)) \
+install: $(addprefix $(INSTALL_LIBDIR)/, $(LIB_SCRIPTS)) \
 	 $(addprefix $(INSTALL_SBINDIR)/, $(SBIN_SCRIPTS)) \
 	 $(addprefix $(INSTALL_DIR)/opsdir/lib/, $(OPS_LIBS))
 
@@ -45,7 +45,7 @@ SCHEMACHECK= cd $(OBJDIR)/protogeni/lib && perl genischemacheck.pl
 else
 SCHEMACHECK= @echo "Skipping schema check, since prefix isn't /usr/testbed"
 endif
-install-schemacheck: genischemacheck.pl
+install-genischemacheck: genischemacheck.pl
 	@echo "Checking DB schema..."
 	$(SCHEMACHECK)
 
-- 
GitLab