From f79467f5a19b02bafe93ea7d3a1008464616328d Mon Sep 17 00:00:00 2001
From: Sjon Hortensius <sjon@hortensius.net>
Date: Sun, 25 Sep 2016 14:41:53 +0200
Subject: [PATCH 1/2] Makefile: only add `uutils` with MULTICALL=y

fixes error when making without MULTICALL=y
> install: cannot stat 'xxx/target/release/deps/uutils': No such file or
directory
---
 Makefile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 73004a18e..e376a5547 100644
--- a/Makefile
+++ b/Makefile
@@ -226,7 +226,10 @@ endef
 EXES        := \
   $(sort $(filter $(UTILS),$(filter-out $(SKIP_UTILS),$(PROGS))))
 
-INSTALLEES  := ${EXES} uutils
+INSTALLEES  := ${EXES}
+ifeq (${MULTICALL}, y)
+INSTALLEES  := ${INSTALLEES} uutils
+endif
 
 # Shared library extension
 SYSTEM := $(shell uname)

From c34c2ea074db8c00a5d86b320291cfcbeffd1d24 Mon Sep 17 00:00:00 2001
From: Sjon Hortensius <sjon@hortensius.net>
Date: Sun, 25 Sep 2016 15:02:40 +0200
Subject: [PATCH 2/2] Makefile: don't symlink `uutils` to itself

Fix error where uutils would be symlinked to itself, resulting in:
> ln: 'uutils' and 'uutils' are the same file
---
 Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index e376a5547..8c8190c1b 100644
--- a/Makefile
+++ b/Makefile
@@ -300,7 +300,8 @@ install: build
 	mkdir -p $(INSTALLDIR_BIN)
 ifeq (${MULTICALL}, y)
 	$(INSTALL) $(BUILDDIR)/uutils $(INSTALLDIR_BIN)/$(PROG_PREFIX)uutils
-	$(foreach prog, $(INSTALLEES), cd $(INSTALLDIR_BIN) && ln -fs $(PROG_PREFIX)uutils $(PROG_PREFIX)$(prog);)
+	$(foreach prog, $(filter-out uutils, $(INSTALLEES)), \
+		cd $(INSTALLDIR_BIN) && ln -fs $(PROG_PREFIX)uutils $(PROG_PREFIX)$(prog);)
 else
 	$(foreach prog, $(INSTALLEES), \
 		$(INSTALL) $(PKG_BUILDDIR)/$(prog) $(INSTALLDIR_BIN)/$(PROG_PREFIX)$(prog);)