RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-28 11:37:44 +00:00
Code Issues Activity

Merge pull request #953 from pthariensflame/fix/shellcheck

Browse source 
Make installation more robust
This commit is contained in:
Jian Zeng 2016-08-09 10:25:22 +08:00 • committed by GitHub
commit 9b3fadff64
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Makefile
View file

@ -32,12 +32,12 @@ PROG_PREFIX ?=
# This won't support any directory with spaces in its name, but you can just # 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. # make a symlink without spaces that points to the directory.
BASEDIR ?= $(shell pwd) BASEDIR ?= $(shell pwd)
BUILDDIR := $(BASEDIR)/target/${PROFILE}/ BUILDDIR := $(BASEDIR)/target/${PROFILE}
PKG_BUILDDIR := $(BUILDDIR)/deps/ PKG_BUILDDIR := $(BUILDDIR)/deps
BUSYBOX_ROOT := $(BASEDIR)/tmp/ BUSYBOX_ROOT := $(BASEDIR)/tmp
BUSYBOX_VER := 1.24.1 BUSYBOX_VER := 1.24.1
BUSYBOX_SRC:=$(BUSYBOX_ROOT)/busybox-$(BUSYBOX_VER)/ BUSYBOX_SRC := $(BUSYBOX_ROOT)/busybox-$(BUSYBOX_VER)
# Possible programs # Possible programs
PROGS := \ PROGS := \
@ -298,7 +298,7 @@ else
$(INSTALL) $(PKG_BUILDDIR)/$(prog) $(INSTALLDIR_BIN)/$(PROG_PREFIX)$(prog);) $(INSTALL) $(PKG_BUILDDIR)/$(prog) $(INSTALLDIR_BIN)/$(PROG_PREFIX)$(prog);)
endif endif
mkdir -p $(INSTALLDIR_LIB) mkdir -p $(INSTALLDIR_LIB)
$(foreach lib, $(LIBS), $(INSTALL) $(BUILDDIR)/$$lib $(INSTALLDIR_LIB)/$(lib);) $(foreach lib, $(LIBS), $(INSTALL) $(BUILDDIR)/$(lib) $(INSTALLDIR_LIB)/$(lib);)
uninstall: uninstall:
ifeq (${MULTICALL}, y) ifeq (${MULTICALL}, y)