Skip to content

Commit ef054dc

Browse files
committed
Merge pull request #308 from sickill/master
Separate PREFIX and DESTDIR to allow staged installs
2 parents ce31d36 + 797358b commit ef054dc

1 file changed

Lines changed: 7 additions & 7 deletions

File tree

Makefile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ PKG_NAME=$(NAME)-$(VERSION)
1313
PKG=$(PKG_DIR)/$(PKG_NAME).tar.gz
1414
SIG=$(PKG).asc
1515

16-
PREFIX?=$(DESTDIR)/usr/local
16+
PREFIX?=/usr/local
1717
DOC_DIR=$(PREFIX)/share/doc/$(PKG_NAME)
1818

1919
pkg:
@@ -59,13 +59,13 @@ rpm:
5959
rpmbuild -ba rpm/chruby.spec
6060

6161
install:
62-
for dir in $(INSTALL_DIRS); do mkdir -p $(PREFIX)/$$dir; done
63-
for file in $(INSTALL_FILES); do cp $$file $(PREFIX)/$$file; done
64-
mkdir -p $(DOC_DIR)
65-
cp -r $(DOC_FILES) $(DOC_DIR)/
62+
for dir in $(INSTALL_DIRS); do mkdir -p $(DESTDIR)$(PREFIX)/$$dir; done
63+
for file in $(INSTALL_FILES); do cp $$file $(DESTDIR)$(PREFIX)/$$file; done
64+
mkdir -p $(DESTDIR)$(DOC_DIR)
65+
cp -r $(DOC_FILES) $(DESTDIR)$(DOC_DIR)/
6666

6767
uninstall:
68-
for file in $(INSTALL_FILES); do rm -f $(PREFIX)/$$file; done
69-
rm -rf $(DOC_DIR)
68+
for file in $(INSTALL_FILES); do rm -f $(DESTDIR)$(PREFIX)/$$file; done
69+
rm -rf $(DESTDIR)$(DOC_DIR)
7070

7171
.PHONY: build download sign verify clean test tag release rpm install uninstall all

0 commit comments

Comments
 (0)