From 7804476163cf91a51a04e8dad63d269c3af5b15f Mon Sep 17 00:00:00 2001
From: Leigh B Stoller <stoller@flux.utah.edu>
Date: Wed, 30 Jan 2013 09:16:39 -0700
Subject: [PATCH] Fix the elabinelab-nogit target so that it will include the
 protogeni/rspec-geni submodule. git archive does not do that on its own.

---
 GNUmakefile.in | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 592c621779..4be72f9f58 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -483,8 +483,10 @@ elabinelab-git: elabinelab-scripts
 	-mkdir -p /share/emulab
 	rm -f /share/emulab/emulab-src.tar.gz
 	(cd $(SRCDIR); \
-	 git archive --prefix=testbed/ HEAD | \
-            gzip -c >/share/emulab/emulab-src.tar.gz)
+	 git archive HEAD > /share/emulab/emulab-src.tar)
+	tar rf /share/emulab/emulab-src.tar -C $(SRCDIR) \
+	 --exclude=.git protogeni/rspec-geni
+	gzip /share/emulab/emulab-src.tar
 else
 elabinelab-nogit: elabinelab-scripts
 	-mkdir -p $(INSTALL_TOPDIR)/src
@@ -495,8 +497,10 @@ elabinelab-git: elabinelab-scripts
 	-mkdir -p $(INSTALL_TOPDIR)/src
 	rm -f $(INSTALL_TOPDIR)/src/emulab-src.tar.gz
 	(cd $(SRCDIR); \
-	 git archive --prefix=testbed/ HEAD | \
-            gzip -c > $(INSTALL_TOPDIR)/src/emulab-src.tar.gz)
+	 git archive HEAD > $(INSTALL_TOPDIR)/src/emulab-src.tar)
+	tar rf $(INSTALL_TOPDIR)/src/emulab-src.tar -C $(SRCDIR) \
+	 --exclude=.git protogeni/rspec-geni
+	gzip $(INSTALL_TOPDIR)/src/emulab-src.tar
 endif
 
 # How to recursively descend into subdirectories to make general
-- 
GitLab