From: =?UTF-8?q?imme=C3=ABmosol?= <will+developer@xxxxxxxxxxx> Make git's diff-highlight program immediately available to the command-line. Create a link in DESTDIR that refers to the generated/concatenated diff-highlight perl script Signed-off-by: immeëmosol <will+developer@xxxxxxxxxxx> --- add symlinking diff-highlight into DESTDIR Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-938%2Fimme-emosol%2Fpatch-1-v3 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-938/imme-emosol/patch-1-v3 Pull-Request: https://github.com/git/git/pull/938 Range-diff vs v2: 1: ca76f336ded ! 1: af4bea815fa diff-highlight: make install link into DESTDIR #Makefile @@ Metadata Author: immeëmosol <will+developer@xxxxxxxxxxx> ## Commit message ## - diff-highlight: make install link into DESTDIR #Makefile + diff-highlight: make install link into DESTDIR Make git's diff-highlight program immediately available to the command-line. Create a link in DESTDIR that @@ contrib/diff-highlight/Makefile: diff-highlight: shebang.perl DiffHighlight.pm d mv $@+ $@ +install: diff-highlight -+ test -w $(DESTDIR) && \ -+ ln --symbolic --target-directory=$(DESTDIR) $(abspath $<) ++ test -w $(DESTDIR) && ln -s $(abspath $<) $(DESTDIR) + shebang.perl: FORCE @echo '#!$(PERL_PATH_SQ)' >$@+ @@ contrib/diff-highlight/Makefile: test: all clean: + test ! -L $(DESTDIR)/diff-highlight || \ -+ $(RM) --force $(DESTDIR)/diff-highlight ++ $(RM) -f $(DESTDIR)/diff-highlight $(RM) diff-highlight .PHONY: FORCE contrib/diff-highlight/Makefile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/contrib/diff-highlight/Makefile b/contrib/diff-highlight/Makefile index f2be7cc9243..a53e09e0bdd 100644 --- a/contrib/diff-highlight/Makefile +++ b/contrib/diff-highlight/Makefile @@ -10,6 +10,9 @@ diff-highlight: shebang.perl DiffHighlight.pm diff-highlight.perl chmod +x $@+ mv $@+ $@ +install: diff-highlight + test -w $(DESTDIR) && ln -s $(abspath $<) $(DESTDIR) + shebang.perl: FORCE @echo '#!$(PERL_PATH_SQ)' >$@+ @cmp $@+ $@ >/dev/null 2>/dev/null || mv $@+ $@ @@ -18,6 +21,9 @@ test: all $(MAKE) -C t clean: + test ! -L $(DESTDIR)/diff-highlight || \ + $(RM) -f $(DESTDIR)/diff-highlight $(RM) diff-highlight .PHONY: FORCE +.PHONY: install base-commit: ef8ce8f3d4344fd3af049c17eeba5cd20d98b69f -- gitgitgadget