From 9394b9da0811075f330bfd14a88dccd726ae39d9 Mon Sep 17 00:00:00 2001 From: Alexander Ronald Altman Date: Mon, 8 Aug 2016 18:51:24 -0700 Subject: [PATCH] Make installation more robust This fixes a few problems I was having with installing on Mac. --- Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 53a28b046..5c766b1ff 100644 --- a/Makefile +++ b/Makefile @@ -32,12 +32,12 @@ PROG_PREFIX ?= # This won't support any directory with spaces in its name, but you can just # make a symlink without spaces that points to the directory. BASEDIR ?= $(shell pwd) -BUILDDIR := $(BASEDIR)/target/${PROFILE}/ -PKG_BUILDDIR := $(BUILDDIR)/deps/ +BUILDDIR := $(BASEDIR)/target/${PROFILE} +PKG_BUILDDIR := $(BUILDDIR)/deps -BUSYBOX_ROOT := $(BASEDIR)/tmp/ -BUSYBOX_VER := 1.24.1 -BUSYBOX_SRC:=$(BUSYBOX_ROOT)/busybox-$(BUSYBOX_VER)/ +BUSYBOX_ROOT := $(BASEDIR)/tmp +BUSYBOX_VER := 1.24.1 +BUSYBOX_SRC := $(BUSYBOX_ROOT)/busybox-$(BUSYBOX_VER) # Possible programs PROGS := \ @@ -298,7 +298,7 @@ else $(INSTALL) $(PKG_BUILDDIR)/$(prog) $(INSTALLDIR_BIN)/$(PROG_PREFIX)$(prog);) endif mkdir -p $(INSTALLDIR_LIB) - $(foreach lib, $(LIBS), $(INSTALL) $(BUILDDIR)/$$lib $(INSTALLDIR_LIB)/$(lib);) + $(foreach lib, $(LIBS), $(INSTALL) $(BUILDDIR)/$(lib) $(INSTALLDIR_LIB)/$(lib);) uninstall: ifeq (${MULTICALL}, y)