uutils/coreutils
0
0
Fork 0
mirror of https://github.com/uutils/coreutils.git synced 2026-06-10 15:48:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

destdir revert, more specific clobbering

Browse Source
This commit is contained in:
Nathan Ross
2015-12-25 00:13:29 -05:00
parent 97793313c0
commit 5c88a52c2f
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+4 -6
View File
@@ -18,13 +18,12 @@ CARGO ?= cargo
CARGOFLAGS ?=
# Install directories
FS_ROOT ?= /
PREFIX ?= /usr/local
DESTDIR ?= /usr/local
BINDIR ?= /bin
LIBDIR ?= /lib
INSTALLDIR_BIN=$(FS_ROOT)$(PREFIX)$(BINDIR)
INSTALLDIR_LIB=$(FS_ROOT)$(PREFIX)$(LIBDIR)
INSTALLDIR_BIN=$(DESTDIR)$(BINDIR)
INSTALLDIR_LIB=$(DESTDIR)$(LIBDIR)
#prefix to apply to uutils binary and all tool binaries
PROG_PREFIX ?=
@@ -274,10 +273,9 @@ distclean: clean
# TODO: figure out if there is way for prefixes to work with the symlinks
install: build
mkdir -p $(INSTALLDIR_BIN)
rm -f $(addprefix $(INSTALLDIR_BIN)/$(PROG_PREFIX),$(INSTALLEES))
ifeq (${MULTICALL}, y)
install $(BUILDDIR)/uutils $(INSTALLDIR_BIN)/$(PROG_PREFIX)uutils
$(foreach prog, $(INSTALLEES), cd $(INSTALLDIR_BIN) && ln -s $(PROG_PREFIX)uutils $(PROG_PREFIX)$(prog);)
$(foreach prog, $(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);)
README.md
+2 -2
View File
@@ -76,7 +76,7 @@ make MULTICALL=y install
Set install parent directory (default value is /usr/local):
```
make PREFIX=/my/path install
make DESTDIR=/my/path install
```
Uninstallation Instructions
@@ -99,7 +99,7 @@ make MULTICALL=y uninstall
To uninstall from a custom parent directory:
```
make PREFIX=/my/path uninstall
make DESTDIR=/my/path uninstall
```
Test Instructions