Merge branch 'jc/no-slim-shell'

diff --git a/Makefile b/Makefile
index 7a6cbb6f03e599de7644e5c3d72b15b89fa6ccfe..4c627fde13730beb5e2e7af7d37ff199ef3924e0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -549,7 +549,6 @@ BUILTIN_OBJS += builtin-rev-parse.o
 BUILTIN_OBJS += builtin-revert.o
 BUILTIN_OBJS += builtin-rm.o
 BUILTIN_OBJS += builtin-send-pack.o
-BUILTIN_OBJS += builtin-shell.o
 BUILTIN_OBJS += builtin-shortlog.o
 BUILTIN_OBJS += builtin-show-branch.o
 BUILTIN_OBJS += builtin-show-ref.o
@@ -832,6 +831,7 @@ EXTLIBS += -lz
 ifndef NO_POSIX_ONLY_PROGRAMS
        PROGRAMS += git-daemon$X
        PROGRAMS += git-imap-send$X
+       PROGRAMS += git-shell$X
 endif
 ifndef NO_OPENSSL
        OPENSSL_LIBSSL = -lssl