From f4e0eec2a293a79dff94804e160f597a7dc40430 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 15 Dec 2013 16:27:46 -0400
Subject: [PATCH] Include man pages in Linux and OSX standalone builds.

---
 Makefile                  | 17 ++++++++++++-----
 debian/changelog          |  1 +
 standalone/linux/runshell |  7 ++++++-
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 92c5f6dcc6..c1fdfd0cc6 100644
--- a/Makefile
+++ b/Makefile
@@ -33,14 +33,16 @@ git-union-merge.1: doc/git-union-merge.mdwn
 git-union-merge:
 	$(GHC) --make -threaded $@
 
+SHAREDIR=share
+
 install-mans: $(mans)
-	install -d $(DESTDIR)$(PREFIX)/share/man/man1
-	install -m 0644 $(mans) $(DESTDIR)$(PREFIX)/share/man/man1
+	install -d $(DESTDIR)$(PREFIX)/$(SHAREDIR)/man/man1
+	install -m 0644 $(mans) $(DESTDIR)$(PREFIX)/$(SHAREDIR)/man/man1
 
 install-docs: docs install-mans
-	install -d $(DESTDIR)$(PREFIX)/share/doc/git-annex
+	install -d $(DESTDIR)$(PREFIX)/$(SHAREDIR)/doc/git-annex
 	if [ -d html ]; then \
-		rsync -a --delete html/ $(DESTDIR)$(PREFIX)/share/doc/git-annex/html/; \
+		rsync -a --delete html/ $(DESTDIR)$(PREFIX)/$(SHAREDIR)/doc/git-annex/html/; \
 	fi
 
 install: build install-docs Build/InstallDesktopFile
@@ -105,7 +107,7 @@ linuxstandalone: Build/Standalone
 	rm -rf "$(LINUXSTANDALONE_DEST)"
 	mkdir -p tmp
 	cp -R standalone/linux "$(LINUXSTANDALONE_DEST)"
-
+	
 	install -d "$(LINUXSTANDALONE_DEST)/bin"
 	cp git-annex "$(LINUXSTANDALONE_DEST)/bin/"
 	strip "$(LINUXSTANDALONE_DEST)/bin/git-annex"
@@ -132,6 +134,8 @@ linuxstandalone: Build/Standalone
 	done
 	sort "$(LINUXSTANDALONE_DEST)/libdirs.tmp" | uniq > "$(LINUXSTANDALONE_DEST)/libdirs"
 	rm -f "$(LINUXSTANDALONE_DEST)/libdirs.tmp"
+	
+	$(MAKE) install-mans DESTDIR="$(LINUXSTANDALONE_DEST)"
 
 	cd tmp/git-annex.linux && find . -type f > git-annex.MANIFEST
 	cd tmp/git-annex.linux && find . -type l >> git-annex.MANIFEST
@@ -158,6 +162,9 @@ osxapp: Build/Standalone Build/OSXMkLibs
 	(cd "$(shell git --exec-path)" && tar c .) | (cd "$(OSXAPP_BASE)" && tar x)
 	install -d "$(OSXAPP_BASE)/templates"
 
+	# OSX looks in man dir nearby the bin
+	$(MAKE) install-mans DESTDIR="$(OSXAPP_BASE)" SHAREDIR=""
+
 	./Build/OSXMkLibs $(OSXAPP_BASE)
 	cd $(OSXAPP_DEST) && find . -type f > Contents/MacOS/git-annex.MANIFEST
 	cd $(OSXAPP_DEST) && find . -type l >> Contents/MacOS/git-annex.MANIFEST
diff --git a/debian/changelog b/debian/changelog
index 4efa2f08c5..a88475d69c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ git-annex (5.20131214) UNRELEASED; urgency=low
   * Programs from Linux and OSX standalone builds can now be symlinked
     into a directory in PATH as an alternative installation method, and will
     use readlink to find where the build was unpacked.
+  * Include man pages in Linux and OSX standalone builds.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 15 Dec 2013 13:32:49 -0400
 
diff --git a/standalone/linux/runshell b/standalone/linux/runshell
index a36e490839..76ed94df51 100755
--- a/standalone/linux/runshell
+++ b/standalone/linux/runshell
@@ -63,8 +63,13 @@ export ORIG_GIT_TEMPLATE_DIR
 GIT_TEMPLATE_DIR="$base/templates"
 export GIT_TEMPLATE_DIR
 
+ORIG_MANPATH="$MANPATH"
+export ORIG_MANPATH
+MANPATH="$base/usr/share/man:$MANPATH"
+export MANPATH
+
 # Indicate which variables were exported above.
-GIT_ANNEX_STANDLONE_ENV="PATH LD_LIBRARY_PATH GIT_EXEC_PATH GIT_TEMPLATE_DIR"
+GIT_ANNEX_STANDLONE_ENV="PATH LD_LIBRARY_PATH GIT_EXEC_PATH GIT_TEMPLATE_DIR MANPATH"
 export GIT_ANNEX_STANDLONE_ENV
 
 if [ "$1" ]; then