From bd2f73a6ba6daf6158112874414d338c7b0e528d Mon Sep 17 00:00:00 2001 From: Johannes Sixt Date: Wed, 28 Feb 2007 11:44:19 +0100 Subject: [PATCH] Support the tools scripted in perl. There is one subtlety in perl/Makefile: The $(prefix) may contain a drive letter-colon combination. But unfortunately, the perl scripts contain a stance that splits the path at colons to find Git.pm. For this reason, we convert the path to the MSYS style, which does not have the colon. --- Makefile | 2 ++ perl/Makefile | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 95b92a3597..cb32c2f2e7 100644 --- a/Makefile +++ b/Makefile @@ -424,6 +424,7 @@ ifeq ($(uname_S),IRIX64) endif ifneq (,$(findstring MINGW,$(uname_S))) SHELL_PATH = $(shell cd /bin && pwd -W)/sh + PERL_PATH = $(shell cd /bin && pwd -W)/perl NO_MMAP=YesPlease NO_PREAD=YesPlease NO_OPENSSL=YesPlease @@ -440,6 +441,7 @@ ifneq (,$(findstring MINGW,$(uname_S))) NO_STRTOUMAX = YesPlease NO_SYMLINKS=YesPlease NO_SVN_TESTS=YesPlease + NO_PERL_MAKEMAKER=YesPlease COMPAT_CFLAGS += -DNO_ETC_PASSWD -DNO_ST_BLOCKS -DSTRIP_EXTENSION=\".exe\" -I compat COMPAT_OBJS += compat/mingw.o compat/fnmatch.o EXTLIBS += -lws2_32 -lregex diff --git a/perl/Makefile b/perl/Makefile index 099beda873..fdb7cb9886 100644 --- a/perl/Makefile +++ b/perl/Makefile @@ -16,7 +16,11 @@ clean: $(RM) $(makfile).old ifdef NO_PERL_MAKEMAKER -instdir_SQ = $(subst ','\'',$(prefix)/lib) +# We exploit that /bin/sh transforms the DOS-Stype path in TEMP into +# the MSYS style pseudo-mount form. +# This colon-free from is needed because our perl scripts look at +# $(instdir_SQ) and split it at colons. +instdir_SQ = $(subst ','\'',$(shell cmd /x/d/c "set TEMP=$(prefix)/lib && sh -c 'echo \$$TEMP'")) $(makfile): ../GIT-CFLAGS Makefile echo all: > $@ echo ' :' >> $@ -- 2.11.4.GIT