Skip to content

Commit cccd47a

Browse files
Expand DESTDIR outside of prefixed dir variables (#669)
Per convention, `DESTDIR` should only be expanded directly in the install/uninstall targets, not prefixed into the directory variables.
1 parent c3831a9 commit cccd47a

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

Makefile

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ SHARDS_CONFIG_BUILD_COMMIT := $(shell git rev-parse --short HEAD 2> /dev/null)
4242
SHARDS_VERSION := $(shell cat VERSION)
4343
SOURCE_DATE_EPOCH := $(shell (git show -s --format=%ct HEAD || stat -c "%Y" Makefile || stat -f "%m" Makefile) 2> /dev/null)
4444
EXPORTS := SHARDS_CONFIG_BUILD_COMMIT="$(SHARDS_CONFIG_BUILD_COMMIT)" SOURCE_DATE_EPOCH="$(SOURCE_DATE_EPOCH)"
45-
BINDIR ?= $(DESTDIR)$(PREFIX)/bin
46-
MANDIR ?= $(DESTDIR)$(PREFIX)/share/man
45+
BINDIR ?= $(PREFIX)/bin
46+
MANDIR ?= $(PREFIX)/share/man
4747
INSTALL ?= /usr/bin/install
4848

4949
MOLINILLO_VERSION = $(shell $(CRYSTAL) eval 'require "yaml"; puts YAML.parse(File.read("shard.lock"))["shards"]["molinillo"]["version"]')
@@ -78,10 +78,10 @@ bin/shards$(EXE): $(SOURCES) $(TEMPLATES) lib
7878
.PHONY: install
7979
install: ## Install shards
8080
install: bin/shards$(EXE) man/shards.1.gz man/shard.yml.5.gz
81-
$(INSTALL) -m 0755 -d "$(BINDIR)" "$(MANDIR)/man1" "$(MANDIR)/man5"
82-
$(INSTALL) -m 0755 bin/shards$(EXE) "$(BINDIR)"
83-
$(INSTALL) -m 0644 man/shards.1.gz "$(MANDIR)/man1"
84-
$(INSTALL) -m 0644 man/shard.yml.5.gz "$(MANDIR)/man5"
81+
$(INSTALL) -m 0755 -d "$(DESTDIR)$(BINDIR)" "$(DESTDIR)$(MANDIR)/man1" "$(DESTDIR)$(MANDIR)/man5"
82+
$(INSTALL) -m 0755 bin/shards$(EXE) "$(DESTDIR)$(BINDIR)"
83+
$(INSTALL) -m 0644 man/shards.1.gz "$(DESTDIR)$(MANDIR)/man1"
84+
$(INSTALL) -m 0644 man/shard.yml.5.gz "$(DESTDIR)$(MANDIR)/man5"
8585

8686
ifeq ($(WINDOWS),1)
8787
.PHONY: install_dlls
@@ -93,9 +93,9 @@ endif
9393
.PHONY: uninstall
9494
uninstall: ## Uninstall shards
9595
uninstall:
96-
rm -f "$(BINDIR)/shards"
97-
rm -f "$(MANDIR)/man1/shards.1.gz"
98-
rm -f "$(MANDIR)/man5/shard.yml.5.gz"
96+
rm -f "$(DESTDIR)$(BINDIR)/shards"
97+
rm -f "$(DESTDIR)$(MANDIR)/man1/shards.1.gz"
98+
rm -f "$(DESTDIR)$(MANDIR)/man5/shard.yml.5.gz"
9999

100100
.PHONY: test
101101
test: ## Run all tests

0 commit comments

Comments
 (0)