From: "immeëmosol via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: "Taylor Blau" <me@ttaylorr.com>,
"Kristoffer Haugsbakk" <kristofferhaugsbakk@fastmail.com>,
immeëmosol <will+developer@willfris.nl>,
immeëmosol <will+developer@willfris.nl>,
immeëmosol <will+developer@willfris.nl>
Subject: [PATCH v3] diff-highlight: make install link into DESTDIR
Date: Sat, 12 Oct 2024 20:23:33 +0000 [thread overview]
Message-ID: <pull.938.v3.git.git.1728764613835.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.938.v2.git.git.1728754230466.gitgitgadget@gmail.com>
From: =?UTF-8?q?imme=C3=ABmosol?= <will+developer@willfris.nl>
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@willfris.nl>
---
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@willfris.nl>
## 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
next prev parent reply other threads:[~2024-10-12 20:23 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-12 15:03 [PATCH] diff-highlight: link to diff-highlight in DESTDIR #Makefile #diff-highlight immeëmosol via GitGitGadget
2024-10-12 15:50 ` Taylor Blau
2024-10-12 17:30 ` [PATCH v2] diff-highlight: make install link into DESTDIR #Makefile immeëmosol via GitGitGadget
2024-10-12 18:35 ` Kristoffer Haugsbakk
2024-10-12 19:10 ` immeëmosol
2024-10-12 19:22 ` Junio C Hamano
2024-10-12 20:23 ` immeëmosol via GitGitGadget [this message]
2024-10-12 20:55 ` [PATCH v3] diff-highlight: make install link into DESTDIR Jeff King
2024-10-12 23:41 ` immeëmosol
2024-10-14 3:29 ` Đoàn Trần Công Danh
2024-10-14 22:17 ` Taylor Blau
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=pull.938.v3.git.git.1728764613835.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=kristofferhaugsbakk@fastmail.com \
--cc=me@ttaylorr.com \
--cc=will+developer@willfris.nl \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.