Merge pull request #1 from t-b/new-sdk-fixes

Fixes for the new SDK
dscho · Oct 13, 2014 · ccb6a7a · ccb6a7a
2 parents 7d0d5cf + 0f2f245
commit ccb6a7a
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/config.mak.uname b/config.mak.uname
@@ -487,7 +487,6 @@ ifneq (,$(findstring MINGW,$(uname_S)))
 	NO_MKDTEMP = YesPlease
 	NO_MKSTEMPS = YesPlease
 	NO_SVN_TESTS = YesPlease
-	NO_PERL_MAKEMAKER = YesPlease
 	RUNTIME_PREFIX = YesPlease
 	NO_ST_BLOCKS_IN_STRUCT_STAT = YesPlease
 	NO_NSEC = YesPlease
@@ -518,7 +517,7 @@ ifneq (,$(findstring MINGW,$(uname_S)))
 	X = .exe
 	SPARSE_FLAGS = -Wno-one-bit-signed-bitfield
 ifneq (,$(wildcard ../THIS_IS_MSYSGIT))
-	htmldir = doc/git/html/
+	htmldir = share/doc/git/$(firstword $(subst -, ,$(GIT_VERSION)))/html
 	prefix =
 	INSTALL = /bin/install
 	EXTLIBS += /mingw/lib/libz.a