summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-06-16 10:06:08 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-06-16 10:06:08 -0700
commit45dc2927168cd9575a8ea81e78f6f5c39cb653f4 (patch)
treef7c4964498075009c6b6988c98072620f22fa01a
parentMerge branch 'jk/do-not-run-httpd-tests-as-root' (diff)
parentwincred: avoid overwriting configured variables (diff)
downloadtgif-45dc2927168cd9575a8ea81e78f6f5c39cb653f4.tar.xz
Merge branch 'sk/wincred'
* sk/wincred: wincred: avoid overwriting configured variables wincred: add install target
-rw-r--r--contrib/credential/wincred/Makefile16
1 files changed, 12 insertions, 4 deletions
diff --git a/contrib/credential/wincred/Makefile b/contrib/credential/wincred/Makefile
index bad45ca47a..6e992c0866 100644
--- a/contrib/credential/wincred/Makefile
+++ b/contrib/credential/wincred/Makefile
@@ -1,14 +1,22 @@
all: git-credential-wincred.exe
-CC = gcc
-RM = rm -f
-CFLAGS = -O2 -Wall
-
-include ../../../config.mak.autogen
-include ../../../config.mak
+CC ?= gcc
+RM ?= rm -f
+CFLAGS ?= -O2 -Wall
+
+prefix ?= /usr/local
+libexecdir ?= $(prefix)/libexec/git-core
+
+INSTALL ?= install
+
git-credential-wincred.exe : git-credential-wincred.c
$(LINK.c) $^ $(LOADLIBES) $(LDLIBS) -o $@
+install: git-credential-wincred.exe
+ $(INSTALL) -m 755 $^ $(libexecdir)
+
clean:
$(RM) git-credential-wincred.exe