Skip to content

Commit ae2081f

Browse files
committed
Fix make install copying the wrong binaries
While testing https://gitlab.com/gitlab-org/build/CNG/-/merge_requests/1062, we found `make install` was not copying the right binaries, such as `gitlab-shell-authorized-keys-check`. This might have originally been written with a single binary in mind (https://gitlab.com/gitlab-org/gitlab-shell/-/issues/207). Changelog: fixed
1 parent 44c6683 commit ae2081f

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

Makefile

+3-4
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ install: compile
6666
mkdir -p $(DESTDIR)$(PREFIX)/bin/
6767
install -m755 bin/check $(DESTDIR)$(PREFIX)/bin/check
6868
install -m755 bin/gitlab-shell $(DESTDIR)$(PREFIX)/bin/gitlab-shell
69-
install -m755 bin/gitlab-shell $(DESTDIR)$(PREFIX)/bin/gitlab-shell-authorized-keys-check
70-
install -m755 bin/gitlab-shell $(DESTDIR)$(PREFIX)/bin/gitlab-shell-authorized-principals-check
71-
install -m755 bin/gitlab-shell $(DESTDIR)$(PREFIX)/bin/gitlab-sshd
72-
69+
install -m755 bin/gitlab-shell-authorized-keys-check $(DESTDIR)$(PREFIX)/bin/gitlab-shell-authorized-keys-check
70+
install -m755 bin/gitlab-shell-authorized-principals-check $(DESTDIR)$(PREFIX)/bin/gitlab-shell-authorized-principals-check
71+
install -m755 bin/gitlab-sshd $(DESTDIR)$(PREFIX)/bin/gitlab-sshd

0 commit comments

Comments
 (0)