From 3a3dc08b7d389db8995b068e332776e34992a3b9 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 10 Dec 2012 15:19:33 -0400
Subject: require all THIRDPARTY_BINS be present to build standalone/app

It's just not acceptable for eg, lsof to be left out.
---
 Makefile | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index b6c0bc674..02cf31aa8 100644
--- a/Makefile
+++ b/Makefile
@@ -160,8 +160,15 @@ linuxstandalone:
 	ln -sf git-annex "$(LINUXSTANDALONE_DEST)/bin/git-annex-shell"
 	zcat standalone/licences.gz > $(LINUXSTANDALONE_DEST)/LICENSE
 
+	set -e; \
 	for bin in $(THIRDPARTY_BINS); do \
-		cp "$$(which "$$bin")" "$(LINUXSTANDALONE_DEST)/bin/" || echo "failed to install $$bin"; \
+		p="$$(which "$$bin")"; \
+		if [ -z "$$p" ]; then \
+			echo "** missing $$bin" >&2; \
+			exit 1; \
+		else \
+			cp "$$p" "$(LINUXSTANDALONE_DEST)/bin/"; \
+		fi; \
 	done
 	
 	install -d "$(LINUXSTANDALONE_DEST)/git-core"
@@ -199,8 +206,15 @@ osxapp:
 	gzcat standalone/licences.gz > $(OSXAPP_BASE)/LICENSE
 	cp $(OSXAPP_BASE)/LICENSE $(GIT_ANNEX_TMP_BUILD_DIR)/build-dmg/LICENSE.txt
 
+	set -e; \
 	for bin in $(THIRDPARTY_BINS); do \
-		cp "$$(which "$$bin")" "$(OSXAPP_BASE)" || echo "failed to install $$bin"; \
+		p="$$(which "$$bin")"; \
+		if [ -z "$$p" ]; then \
+			echo "** missing $$bin" >&2; \
+			exit 1; \
+		else \
+			cp "$$p" "$(OSXAPP_BASE)"; \
+		fi; \
 	done
 
 	(cd "$(shell git --exec-path)" && tar c .) | (cd "$(OSXAPP_BASE)" && tar x)
-- 
cgit v1.2.3