Merge branch 'jk/help-alias'

diff --git a/Makefile b/Makefile
index b460bb21645c3d0c328a00156a2e020167df6b80..8d9f11e75e8fb1095761fd7fd25e66b1d73e6fa2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -742,6 +742,7 @@ endif
 ifdef THREADED_DELTA_SEARCH
        BASIC_CFLAGS += -DTHREADED_DELTA_SEARCH
        EXTLIBS += -lpthread
+       LIB_OBJS += thread-utils.o
 endif
 
 ifeq ($(TCLTK_PATH),)
@@ -1103,7 +1104,7 @@ git.spec: git.spec.in
        mv $@+ $@
 
 GIT_TARNAME=git-$(GIT_VERSION)
-dist: git.spec git-archive configure
+dist: git.spec git-archive$(X) configure
        ./git-archive --format=tar \
                --prefix=$(GIT_TARNAME)/ HEAD^{tree} > $(GIT_TARNAME).tar
        @mkdir -p $(GIT_TARNAME)