aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2010-12-12 13:15:16 -0400
committerGravatar Joey Hess <joey@kitenet.net>2010-12-12 13:15:16 -0400
commit98ad5402d9b095b07df82f088cf0a19c8298ca0c (patch)
tree112c21c8e6c3093ef9f96ba0907b3353752bdd6d
parentf8b59360e386c725dc5e6961beaa78621585d1e1 (diff)
Makefile: Install man page and html (when built).
-rw-r--r--Makefile16
-rw-r--r--debian/changelog6
-rw-r--r--debian/docs1
3 files changed, 18 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index db34294f7..5a3935643 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 c66a536d5..7e08b0731 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 <joeyh@debian.org> 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 1936cc1d4..000000000
--- a/debian/docs
+++ /dev/null
@@ -1 +0,0 @@
-html