mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Include man pages in Linux and OSX standalone builds.

Browse source
This commit is contained in:
Joey Hess 2013-12-15 16:27:46 -04:00
parent 6be19b0070
commit f4e0eec2a2
3 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Makefile
View file

@ -33,14 +33,16 @@ git-union-merge.1: doc/git-union-merge.mdwn
git-union-merge: git-union-merge:
$(GHC) --make -threaded $@ $(GHC) --make -threaded $@
SHAREDIR=share
install-mans: $(mans) install-mans: $(mans)
install -d $(DESTDIR)$(PREFIX)/share/man/man1 install -d $(DESTDIR)$(PREFIX)/$(SHAREDIR)/man/man1
install -m 0644 $(mans) $(DESTDIR)$(PREFIX)/share/man/man1 install -m 0644 $(mans) $(DESTDIR)$(PREFIX)/$(SHAREDIR)/man/man1
install-docs: docs install-mans 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 \ 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 fi
install: build install-docs Build/InstallDesktopFile install: build install-docs Build/InstallDesktopFile
@ -133,6 +135,8 @@ linuxstandalone: Build/Standalone
sort "$(LINUXSTANDALONE_DEST)/libdirs.tmp" | uniq > "$(LINUXSTANDALONE_DEST)/libdirs" sort "$(LINUXSTANDALONE_DEST)/libdirs.tmp" | uniq > "$(LINUXSTANDALONE_DEST)/libdirs"
rm -f "$(LINUXSTANDALONE_DEST)/libdirs.tmp" 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 f > git-annex.MANIFEST
cd tmp/git-annex.linux && find . -type l >> git-annex.MANIFEST cd tmp/git-annex.linux && find . -type l >> git-annex.MANIFEST
cd tmp && tar czf git-annex-standalone-$(shell dpkg --print-architecture).tar.gz git-annex.linux cd tmp && tar czf git-annex-standalone-$(shell dpkg --print-architecture).tar.gz git-annex.linux
@ -158,6 +162,9 @@ osxapp: Build/Standalone Build/OSXMkLibs
(cd "$(shell git --exec-path)" && tar c .) | (cd "$(OSXAPP_BASE)" && tar x) (cd "$(shell git --exec-path)" && tar c .) | (cd "$(OSXAPP_BASE)" && tar x)
install -d "$(OSXAPP_BASE)/templates" install -d "$(OSXAPP_BASE)/templates"
# OSX looks in man dir nearby the bin
$(MAKE) install-mans DESTDIR="$(OSXAPP_BASE)" SHAREDIR=""
./Build/OSXMkLibs $(OSXAPP_BASE) ./Build/OSXMkLibs $(OSXAPP_BASE)
cd $(OSXAPP_DEST) && find . -type f > Contents/MacOS/git-annex.MANIFEST cd $(OSXAPP_DEST) && find . -type f > Contents/MacOS/git-annex.MANIFEST
cd $(OSXAPP_DEST) && find . -type l >> Contents/MacOS/git-annex.MANIFEST cd $(OSXAPP_DEST) && find . -type l >> Contents/MacOS/git-annex.MANIFEST

1
debian/changelog vendored
View file

@ -7,6 +7,7 @@ git-annex (5.20131214) UNRELEASED; urgency=low
* Programs from Linux and OSX standalone builds can now be symlinked * Programs from Linux and OSX standalone builds can now be symlinked
into a directory in PATH as an alternative installation method, and will into a directory in PATH as an alternative installation method, and will
use readlink to find where the build was unpacked. 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 -- Joey Hess <joeyh@debian.org> Sun, 15 Dec 2013 13:32:49 -0400

7
standalone/linux/runshell
View file

@ -63,8 +63,13 @@ export ORIG_GIT_TEMPLATE_DIR
GIT_TEMPLATE_DIR="$base/templates" GIT_TEMPLATE_DIR="$base/templates"
export GIT_TEMPLATE_DIR export GIT_TEMPLATE_DIR
ORIG_MANPATH="$MANPATH"
export ORIG_MANPATH
MANPATH="$base/usr/share/man:$MANPATH"
export MANPATH
# Indicate which variables were exported above. # 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 export GIT_ANNEX_STANDLONE_ENV
if [ "$1" ]; then if [ "$1" ]; then