Merge branch 'bf/installation-fixes' into master

newren · Nov 13, 2019 · 3334c5c · 3334c5c
2 parents 8d8410e + 2cbd4a4
commit 3334c5c
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/Makefile b/Makefile
@@ -26,18 +26,18 @@ fixup_locale:
 snag_docs: Documentation/man1/git-filter-repo.1 Documentation/html/git-filter-repo.html
 
 Documentation/man1/git-filter-repo.1:
-	mkdir -p man1
-	git show docs:man1/git-filter-repo.1 >Documentation/man1/git-filter-repo.1
+	mkdir -p Documentation/man1
+	git show origin/docs:man1/git-filter-repo.1 >Documentation/man1/git-filter-repo.1
 
 Documentation/html/git-filter-repo.html:
-	mkdir -p html
-	git show docs:html/git-filter-repo.html >Documentation/html/git-filter-repo.html
+	mkdir -p Documentation/html
+	git show origin/docs:html/git-filter-repo.html >Documentation/html/git-filter-repo.html
 
 install: snag_docs #fixup_locale
-	cp -a git-filter-repo $(bindir)/
-	ln -s $(bindir)/git-filter-repo $(pythondir)/git_filter_repo.py
-	cp -a Documentation/man1/git-filter-repo.1 $(mandir)/man1/git-filter-repo.1
-	cp -a Documentation/html/git-filter-repo.html $(htmldir)/git-filter-repo.html
+	cp -a git-filter-repo "$(bindir)/"
+	ln -sf "$(bindir)/git-filter-repo" "$(pythondir)/git_filter_repo.py"
+	cp -a Documentation/man1/git-filter-repo.1 "$(mandir)/man1/git-filter-repo.1"
+	cp -a Documentation/html/git-filter-repo.html "$(htmldir)/git-filter-repo.html"
 
 
 #