summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-05-06 18:00:46 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-05-06 18:00:46 (GMT)
commit606ee4be54b5ef3c8593a71b4b1bd6b4ee2d323d (patch)
treefd9957b9fef3c0165a0bb1b55708812c0395f12f /Makefile
parentefa67bfd16f4260275654bc4194744dd65353350 (diff)
parent239b5ed9c9b7b7f219b05c8d71e29db7b970eb48 (diff)
downloadgit-606ee4be54b5ef3c8593a71b4b1bd6b4ee2d323d.zip
git-606ee4be54b5ef3c8593a71b4b1bd6b4ee2d323d.tar.gz
git-606ee4be54b5ef3c8593a71b4b1bd6b4ee2d323d.tar.bz2
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
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 3a1fe20..ef57c1c 100644
--- a/Makefile
+++ b/Makefile
@@ -1680,7 +1680,9 @@ strip: $(PROGRAMS) git$X
git.o: common-cmds.h
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 \