git-config-set: support selecting values by non-matching regex

[git.git] / Makefile

diff --git a/Makefile b/Makefile
index 285b3ed..092931a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -125,7 +125,8 @@ PROGRAMS = \
        git-unpack-objects$X git-update-index$X git-update-server-info$X \
        git-upload-pack$X git-verify-pack$X git-write-tree$X \
        git-update-ref$X git-symbolic-ref$X git-check-ref-format$X \
-       git-name-rev$X git-pack-redundant$X git-var$X $(SIMPLE_PROGRAMS)
+       git-name-rev$X git-pack-redundant$X git-config-set$X git-var$X \
+       $(SIMPLE_PROGRAMS)
 
 # Backward compatibility -- to be removed after 1.0
 PROGRAMS += git-ssh-pull$X git-ssh-push$X
@@ -242,9 +243,12 @@ ifndef NO_CURL
                CURL_LIBCURL = -lcurl
        endif
        PROGRAMS += git-http-fetch$X
-       ifndef NO_EXPAT
-               EXPAT_LIBEXPAT = -lexpat
-               PROGRAMS += git-http-push$X
+       curl_check := $(shell (echo 070908; curl-config --vernum) | sort -r | sed -ne 2p)
+       ifeq "$(curl_check)" "070908"
+               ifndef NO_EXPAT
+                       EXPAT_LIBEXPAT = -lexpat
+                       PROGRAMS += git-http-push$X
+               endif
        endif
 endif