Skip to content

Commit 5821566

Browse files
committed
Merge branch 'msys2-htmldir'
Git for Windows ships with a subset of MSYS2, and tries to integrate smoothly, so we want to install the documentation in the location that is recommended by MSYS2. Signed-off-by: Johannes Schindelin <[email protected]>
2 parents 900e2ef + 77ba9f9 commit 5821566

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

config.mak.uname

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -616,7 +616,7 @@ ifneq (,$(findstring MINGW,$(uname_S)))
616616
NATIVE_CRLF = YesPlease
617617
X = .exe
618618
ifneq (,$(wildcard ../THIS_IS_MSYSGIT))
619-
htmldir = doc/git/html/
619+
htmldir = share/doc/git/$(firstword $(subst -, ,$(GIT_VERSION)))/html
620620
prefix =
621621
INSTALL = /bin/install
622622
EXTLIBS += /mingw/lib/libz.a

0 commit comments

Comments
 (0)