From 04076cd5df2a47c61432a380a167da3d4f089256 Mon Sep 17 00:00:00 2001 From: Andre Cerqueira Date: Sun, 26 May 2013 15:45:31 -0300 Subject: [PATCH 1/2] fixed Makefile uninstall target for man files --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index ad9c632..376c58b 100644 --- a/Makefile +++ b/Makefile @@ -39,8 +39,8 @@ uninstall: rm -f $(DESTDIR)$(PREFIX)/$(BIN); \ ) @$(foreach MAN, $(MAN_PAGES), \ - echo "... uninstalling $(DESTDIR)$(MANPREFIX)/$(MAN)"; \ - rm -f $(DESTDIR)$(MANPREFIX)/$(MAN); \ + echo "... uninstalling $(DESTDIR)$(MANPREFIX)/$(notdir $(MAN))"; \ + rm -f $(DESTDIR)$(MANPREFIX)/$(notdir $(MAN)); \ ) rm -f $(DESTDIR)/etc/bash_completion.d/git-extras From ad045b77770f51cea3ccf35b8c0d65c0ceb96d3b Mon Sep 17 00:00:00 2001 From: Andre Cerqueira Date: Sun, 26 May 2013 15:48:17 -0300 Subject: [PATCH 2/2] improved Makefile with BINPREFIX --- Makefile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 376c58b..640314e 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,5 @@ PREFIX ?= /usr/local +BINPREFIX ?= "$(PREFIX)/bin" MANPREFIX ?= "$(PREFIX)/share/man/man1" BINS = $(wildcard bin/git-*) MANS = $(wildcard man/git-*.md) @@ -9,12 +10,12 @@ docs: $(MAN_HTML) $(MAN_PAGES) install: @mkdir -p $(DESTDIR)$(MANPREFIX) - @mkdir -p $(DESTDIR)$(PREFIX)/bin - @echo "... installing bins to $(DESTDIR)$(PREFIX)/bin" + @mkdir -p $(DESTDIR)$(BINPREFIX) + @echo "... installing bins to $(DESTDIR)$(BINPREFIX)" @echo "... installing man pages to $(DESTDIR)$(MANPREFIX)" @$(foreach BIN, $(BINS), \ - echo "... installing `basename $(BIN)`"; \ - cp -f $(BIN) $(DESTDIR)$(PREFIX)/$(BIN); \ + echo "... installing $(notdir $(BIN))"; \ + cp -f $(BIN) $(DESTDIR)$(BINPREFIX); \ ) cp -f man/git-*.1 $(DESTDIR)$(MANPREFIX) @mkdir -p $(DESTDIR)/etc/bash_completion.d @@ -35,8 +36,8 @@ man/%.1: man/%.md uninstall: @$(foreach BIN, $(BINS), \ - echo "... uninstalling $(DESTDIR)$(PREFIX)/$(BIN)"; \ - rm -f $(DESTDIR)$(PREFIX)/$(BIN); \ + echo "... uninstalling $(DESTDIR)$(BINPREFIX)/$(notdir $(BIN))"; \ + rm -f $(DESTDIR)$(BINPREFIX)/$(notdir $(BIN)); \ ) @$(foreach MAN, $(MAN_PAGES), \ echo "... uninstalling $(DESTDIR)$(MANPREFIX)/$(notdir $(MAN))"; \