From 0fdfab366e8b9b8c2b895ea6fc120aeb6b2a7f23 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 12 Dec 2012 12:02:54 -0400 Subject: [PATCH] put sbin directories in PATH when building standalone so lsof is found This ensures that the standalone builds will include lsof, and it'll then be in the runshell PATH, so will work. This does not deal with manual builds where lsof is not in path, which will fail at runtime due to the program being missing. --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 37dc38b4ea..4196a11679 100644 --- a/Makefile +++ b/Makefile @@ -162,7 +162,7 @@ linuxstandalone: set -e; \ for bin in $(THIRDPARTY_BINS); do \ - p="$$(which "$$bin")"; \ + p="$$(PATH=$$PATH:/usr/sbin:/sbin:/usr/local/sbin which "$$bin")"; \ if [ -z "$$p" ]; then \ echo "** missing $$bin" >&2; \ exit 1; \ @@ -207,7 +207,7 @@ osxapp: cp $(OSXAPP_BASE)/LICENSE $(GIT_ANNEX_TMP_BUILD_DIR)/build-dmg/LICENSE.txt for bin in $(THIRDPARTY_BINS); do \ - p="$$(which "$$bin")"; \ + p="$$(PATH=$$PATH:/usr/sbin:/sbin:/usr/local/sbin which "$$bin")"; \ if [ -z "$$p" ]; then \ echo "** missing $$bin" >&2; \ exit 1; \