From: Steffen Prohaska Date: Mon, 22 Sep 2008 05:57:04 GMT Subject: Re: [PATCH 7/7] Windows: Revert to default paths and convert them by RUNTIME_PREFIX Message-ID: <627E3F3B-D557-474B-BA20-3ABDEC9E2813@zib.de> In-Reply-To: <200809212358.48125.johannes.sixt@telecom.at> On Sep 21, 2008, at 11:58 PM, Johannes Sixt wrote: > On Sonntag, 21. September 2008, Steffen Prohaska wrote: >> The RUNTIME_PREFIX mechanism allows us to use the default >> (absolute) paths >> on Windows too. Defining RUNTIME_PREFIX explicitly requests for >> translation of paths during runtime, depending on the path to the >> executable. >> >> Signed-off-by: Steffen Prohaska >> --- >> Makefile | 4 +--- >> 1 files changed, 1 insertions(+), 3 deletions(-) >> >> diff --git a/Makefile b/Makefile >> index 8181f74..98278f0 100644 >> --- a/Makefile >> +++ b/Makefile >> @@ -767,6 +767,7 @@ ifneq (,$(findstring MINGW,$(uname_S))) >> SNPRINTF_RETURNS_BOGUS = YesPlease >> NO_SVN_TESTS = YesPlease >> NO_PERL_MAKEMAKER = YesPlease >> + RUNTIME_PREFIX = YesPlease >> NO_POSIX_ONLY_PROGRAMS = YesPlease >> NO_ST_BLOCKS_IN_STRUCT_STAT = YesPlease >> COMPAT_CFLAGS += -D__USE_MINGW_ACCESS -DNOGDI -Icompat -Icompat/ >> regex >> -Icompat/fnmatch @@ -775,9 +776,6 @@ ifneq (,$(findstring >> MINGW,$(uname_S))) >> COMPAT_OBJS += compat/mingw.o compat/fnmatch/fnmatch.o >> compat/regex/regex.o compat/winansi.o EXTLIBS += -lws2_32 >> X = .exe >> - gitexecdir = ../libexec/git-core >> - template_dir = ../share/git-core/templates/ >> - ETC_GITCONFIG = ../etc/gitconfig >> endif >> ifneq (,$(findstring arm,$(uname_M))) >> ARM_SHA1 = YesPlease > > This cannot be the complete patch. The part that sets $(prefix) to > the empty > string is missing, otherwise the runtime prefix discovery would never > trigger, right? (But see also my comment on [PATCH 1/7].) Right. There are still some differences between msysgit's Makefile and the official one, so I forgot to include all necessary changes. I'll modify the implementation as you propose in your comment on [PATCH 1/7]. Steffen