Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] master from nelhage:master #177

Merged
merged 3 commits into from
Jan 15, 2025
Merged

[pull] master from nelhage:master #177

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
038ab61
fix(Makefile): Make bash completion honor PREFIX
tokuchan Jan 14, 2025
e59ca8b
Stop using pkg-config to get the bash completion dir
nelhage Jan 15, 2025
e294304
Merge pull request #155 from tokuchan/pull-request--fix-prefix-issue-…
nelhage Jan 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ test/victim: override LDFLAGS := $(VICTIM_LDFLAGS)
clean:
rm -f reptyr $(OBJS) test/victim.o test/victim $(DEPS)

BASHCOMPDIR ?= $(shell $(PKG_CONFIG) --variable=completionsdir bash-completion 2>/dev/null)
BASHCOMPDIR ?= $PREFIX/share/bash-completion/completions/

install: reptyr
install -d -m 755 $(DESTDIR)$(BINDIR)
Expand All @@ -50,10 +50,8 @@ install: reptyr
install -m 644 reptyr.1 $(DESTDIR)$(MANDIR)/man1/reptyr.1
install -d -m 755 $(DESTDIR)$(MANDIR)/fr/man1
install -m 644 reptyr.fr.1 $(DESTDIR)$(MANDIR)/fr/man1/reptyr.1
bashcompdir=$(BASHCOMPDIR) ; \
test -z "$$bashcompdir" && bashcompdir=/etc/bash_completion.d ; \
install -d -m 755 $(DESTDIR)$$bashcompdir ; \
install -m 644 reptyr.bash $(DESTDIR)$$bashcompdir/reptyr
install -d -m 755 $(DESTDIR)$(BASHCOMPDIR) ; \
install -m 644 reptyr.bash $(DESTDIR)$(BASHCOMPDIR)/reptyr

.PHONY: PHONY

Expand Down
Loading