Skip to content

Commit 2565522

Browse files
sprohaskagitster
authored andcommitted
Windows: Revert to default paths and convert them by RUNTIME_PREFIX
The RUNTIME_PREFIX mechanism allows us to use the default paths on Windows too. Defining RUNTIME_PREFIX explicitly requests for translation of paths relative to the executable at runtime. Signed-off-by: Steffen Prohaska <prohaska@zib.de> Acked-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 35fb0e8 commit 2565522

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

Makefile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -789,6 +789,7 @@ ifneq (,$(findstring MINGW,$(uname_S)))
789789
SNPRINTF_RETURNS_BOGUS = YesPlease
790790
NO_SVN_TESTS = YesPlease
791791
NO_PERL_MAKEMAKER = YesPlease
792+
RUNTIME_PREFIX = YesPlease
792793
NO_POSIX_ONLY_PROGRAMS = YesPlease
793794
NO_ST_BLOCKS_IN_STRUCT_STAT = YesPlease
794795
COMPAT_CFLAGS += -D__USE_MINGW_ACCESS -DNOGDI -Icompat -Icompat/regex -Icompat/fnmatch
@@ -797,9 +798,6 @@ ifneq (,$(findstring MINGW,$(uname_S)))
797798
COMPAT_OBJS += compat/mingw.o compat/fnmatch/fnmatch.o compat/regex/regex.o compat/winansi.o
798799
EXTLIBS += -lws2_32
799800
X = .exe
800-
gitexecdir = ../libexec/git-core
801-
template_dir = ../share/git-core/templates/
802-
ETC_GITCONFIG = ../etc/gitconfig
803801
endif
804802
ifneq (,$(findstring arm,$(uname_M)))
805803
ARM_SHA1 = YesPlease

0 commit comments

Comments
 (0)