mirror of
https://github.com/uutils/coreutils
synced 2024-07-21 09:54:42 +00:00
Make installation more robust
This fixes a few problems I was having with installing on Mac.
This commit is contained in:
parent
3618d9df94
commit
9394b9da08
12
Makefile
12
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)
|
||||
|
|
Loading…
Reference in a new issue