github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #5662 from thaJeztah/fix_destdir

Browse Source 
Makefile: fix DESTDIR and PREFIX concatenation
This commit is contained in:
Akihiro Suda 2021-06-25 23:41:16 +09:00 committed by GitHub
commit e72a56a1e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@ -255,8 +255,8 @@ man/%: docs/man/%.md FORCE
go-md2man -in "$<" -out "$@" go-md2man -in "$<" -out "$@"
define installmanpage define installmanpage
$(INSTALL) -d $(DESTDIR)/$(MANDIR)/man$(2); $(INSTALL) -d $(DESTDIR)$(MANDIR)/man$(2);
gzip -c $(1) >$(DESTDIR)/$(MANDIR)/man$(2)/$(3).gz; gzip -c $(1) >$(DESTDIR)$(MANDIR)/man$(2)/$(3).gz;
endef endef
install-man: man install-man: man
@ -351,12 +351,12 @@ clean-test: ## clean up debris from previously failed tests
install: ## install binaries install: ## install binaries
@echo "$(WHALE) $@ $(BINARIES)" @echo "$(WHALE) $@ $(BINARIES)"
@$(INSTALL) -d $(DESTDIR)/$(PREFIX)/bin @$(INSTALL) -d $(DESTDIR)$(PREFIX)/bin
@$(INSTALL) $(BINARIES) $(DESTDIR)/$(PREFIX)/bin @$(INSTALL) $(BINARIES) $(DESTDIR)$(PREFIX)/bin
uninstall: uninstall:
@echo "$(WHALE) $@" @echo "$(WHALE) $@"
@rm -f $(addprefix $(DESTDIR)/$(PREFIX)/bin/,$(notdir $(BINARIES))) @rm -f $(addprefix $(DESTDIR)$(PREFIX)/bin/,$(notdir $(BINARIES)))
ifeq ($(GOOS),windows) ifeq ($(GOOS),windows)
install-deps: install-deps: