From 98ad5402d9b095b07df82f088cf0a19c8298ca0c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 12 Dec 2010 13:15:16 -0400 Subject: [PATCH] Makefile: Install man page and html (when built). --- Makefile | 16 ++++++++++++---- debian/changelog | 6 ++++++ debian/docs | 1 - 3 files changed, 18 insertions(+), 5 deletions(-) delete mode 100644 debian/docs diff --git a/Makefile b/Makefile index db34294f7b..5a39356432 100644 --- a/Makefile +++ b/Makefile @@ -1,18 +1,27 @@ PREFIX=/usr GHCMAKE=ghc -Wall -odir build -hidir build -O2 --make -all: git-annex docs +all: git-annex git-annex.1 docs SysConfig.hs: configure.hs $(GHCMAKE) configure ./configure +git-annex.1: + ./mdwn2man git-annex 1 doc/git-annex.mdwn > git-annex.1 + git-annex: SysConfig.hs $(GHCMAKE) git-annex -install: +install: all install -d $(DESTDIR)$(PREFIX)/bin install git-annex $(DESTDIR)$(PREFIX)/bin + install -d $(DESTDIR)$(PREFIX)/share/man/man1 + install -m 0644 git-annex.1 $(DESTDIR)$(PREFIX)/share/man/man1 + install -d $(DESTDIR)$(PREFIX)/share/doc/git-annex + if [ -d html ]; then \ + rsync -a --delete html/ $(DESTDIR)$(PREFIX)/share/doc/git-annex/html/; \ + fi test: $(GHCMAKE) test @@ -26,8 +35,7 @@ else IKIWIKI=ikiwiki endif -docs: - ./mdwn2man git-annex 1 doc/git-annex.mdwn > git-annex.1 +docs: git-annex.1 $(IKIWIKI) doc html -v --wikiname git-annex --plugin=goodstuff \ --no-usedirs --disable-plugin=openid --plugin=sidebar \ --underlaydir=/dev/null --disable-plugin=shortcut \ diff --git a/debian/changelog b/debian/changelog index c66a536d5b..7e08b07310 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +git-annex (0.13) UNRELEASED; urgency=low + + * Makefile: Install man page and html (when built). + + -- Joey Hess Sun, 12 Dec 2010 13:14:58 -0400 + git-annex (0.12) unstable; urgency=low * Add --exclude option to exclude files from processing. diff --git a/debian/docs b/debian/docs deleted file mode 100644 index 1936cc1d44..0000000000 --- a/debian/docs +++ /dev/null @@ -1 +0,0 @@ -html