From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 6 May 2011 18:00:46 +0000 (-0700)
Subject: Merge branch 'js/info-man-path'
X-Git-Tag: v1.7.6-rc0~94
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=606ee4be54b5ef3c8593a71b4b1bd6b4ee2d323d;p=git.git

Merge branch 'js/info-man-path'

* js/info-man-path:
  Documentation: clarify meaning of --html-path, --man-path, and --info-path
  git: add --info-path and --man-path options

Conflicts:
	Makefile
---

606ee4be54b5ef3c8593a71b4b1bd6b4ee2d323d
diff --cc Makefile
index 3a1fe20ff,322c59b76..ef57c1c9b
--- a/Makefile
+++ b/Makefile
@@@ -1679,8 -1675,10 +1679,10 @@@ strip: $(PROGRAMS) git$
  	$(STRIP) $(STRIP_OPTS) $(PROGRAMS) git$X
  
  git.o: common-cmds.h
 -git.s git.o: EXTRA_CPPFLAGS = -DGIT_VERSION='"$(GIT_VERSION)"' \
 +git.sp git.s git.o: EXTRA_CPPFLAGS = -DGIT_VERSION='"$(GIT_VERSION)"' \
- 	'-DGIT_HTML_PATH="$(htmldir_SQ)"'
+ 	'-DGIT_HTML_PATH="$(htmldir_SQ)"' \
+ 	'-DGIT_MAN_PATH="$(mandir_SQ)"' \
+ 	'-DGIT_INFO_PATH="$(infodir_SQ)"'
  
  git$X: git.o $(BUILTIN_OBJS) $(GITLIBS)
  	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ git.o \