diff options
-rw-r--r-- | .gitignore | 3 | ||||
-rwxr-xr-x | Build/mdwn2man | 1 | ||||
-rw-r--r-- | Makefile | 9 |
3 files changed, 8 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore index 0e90a5f80..bacfc4df3 100644 --- a/.gitignore +++ b/.gitignore @@ -13,8 +13,7 @@ Build/OSXMkLibs Build/LinuxMkLibs Build/BuildVersion git-annex -git-annex.1 -git-annex-shell.1 +man git-union-merge git-union-merge.1 doc/.ikiwiki diff --git a/Build/mdwn2man b/Build/mdwn2man index dce8da7ec..a29ce649e 100755 --- a/Build/mdwn2man +++ b/Build/mdwn2man @@ -3,6 +3,7 @@ my $prog=shift; $prog=~s/\.\d+$//; +$prog=~s/man\///; my $section=shift; print ".TH $prog $section\n"; @@ -1,4 +1,4 @@ -mans=git-annex.1 $(shell find doc -maxdepth 1 -name git-annex-*.mdwn | sed -e 's/doc\///' -e 's/\.mdwn/\.1/') +mans=$(shell find doc -maxdepth 1 -name git-annex*.mdwn | sed -e 's/^doc/man/' -e 's/\.mdwn/\.1/') all=git-annex $(mans) docs CABAL?=cabal # set to "./Setup" if you lack a cabal program @@ -24,7 +24,7 @@ git-annex: Build/SysConfig.hs $(CABAL) build ln -sf dist/build/git-annex/git-annex git-annex -%.1: doc/%.mdwn +man/%.1: doc/%.mdwn ./Build/mdwn2man $@ 1 $< > $@ # These are not built normally. @@ -67,7 +67,10 @@ else IKIWIKI=ikiwiki endif -mans: $(mans) +mans: man $(mans) + +man: + mkdir -p man docs: mans $(IKIWIKI) doc html -v --wikiname git-annex --plugin=goodstuff \ |