fix man page building
This commit is contained in:
parent
67f50e9cdd
commit
c8dd196234
5 changed files with 22 additions and 6 deletions
2
.gitignore
vendored
2
.gitignore
vendored
|
@ -11,7 +11,7 @@ Build/Standalone
|
||||||
Build/OSXMkLibs
|
Build/OSXMkLibs
|
||||||
Build/LinuxMkLibs
|
Build/LinuxMkLibs
|
||||||
Build/BuildVersion
|
Build/BuildVersion
|
||||||
Build/Mans
|
Build/MakeMans
|
||||||
git-annex
|
git-annex
|
||||||
man
|
man
|
||||||
git-union-merge
|
git-union-merge
|
||||||
|
|
15
Build/MakeMans.hs
Normal file
15
Build/MakeMans.hs
Normal file
|
@ -0,0 +1,15 @@
|
||||||
|
{- Build man pages, for use by Makefile
|
||||||
|
-
|
||||||
|
- Copyright 2016 Joey Hess <id@joeyh.name>
|
||||||
|
-
|
||||||
|
- Licensed under the GNU GPL version 3 or higher.
|
||||||
|
-}
|
||||||
|
|
||||||
|
{-# OPTIONS_GHC -fno-warn-tabs #-}
|
||||||
|
|
||||||
|
module Main where
|
||||||
|
|
||||||
|
import Build.Mans
|
||||||
|
|
||||||
|
main :: IO ()
|
||||||
|
main = buildMansOrWarn
|
|
@ -18,8 +18,8 @@ import System.Exit
|
||||||
import Data.Maybe
|
import Data.Maybe
|
||||||
import Utility.Exception
|
import Utility.Exception
|
||||||
|
|
||||||
main :: IO ()
|
buildMansOrWarn :: IO ()
|
||||||
main = do
|
buildMansOrWarn = do
|
||||||
mans <- buildMans
|
mans <- buildMans
|
||||||
when (any isNothing mans) $
|
when (any isNothing mans) $
|
||||||
error "mdwn2man failed"
|
error "mdwn2man failed"
|
||||||
|
|
6
Makefile
6
Makefile
|
@ -76,8 +76,8 @@ else
|
||||||
IKIWIKI=ikiwiki
|
IKIWIKI=ikiwiki
|
||||||
endif
|
endif
|
||||||
|
|
||||||
mans: Build/Mans
|
mans: Build/MakeMans
|
||||||
./Build/Mans
|
./Build/MakeMans
|
||||||
|
|
||||||
docs: mans
|
docs: mans
|
||||||
LC_ALL=C TZ=UTC $(IKIWIKI) doc html -v --wikiname git-annex \
|
LC_ALL=C TZ=UTC $(IKIWIKI) doc html -v --wikiname git-annex \
|
||||||
|
@ -111,7 +111,7 @@ Build/OSXMkLibs: Build/OSXMkLibs.hs
|
||||||
$(GHC) --make $@ -Wall -fno-warn-tabs
|
$(GHC) --make $@ -Wall -fno-warn-tabs
|
||||||
Build/LinuxMkLibs: Build/LinuxMkLibs.hs
|
Build/LinuxMkLibs: Build/LinuxMkLibs.hs
|
||||||
$(GHC) --make $@ -Wall -fno-warn-tabs
|
$(GHC) --make $@ -Wall -fno-warn-tabs
|
||||||
Build/Mans: Build/Mans.hs
|
Build/MakeMans: Build/MakeMans.hs
|
||||||
$(GHC) --make $@ -Wall -fno-warn-tabs
|
$(GHC) --make $@ -Wall -fno-warn-tabs
|
||||||
|
|
||||||
# Upload to hackage.
|
# Upload to hackage.
|
||||||
|
|
|
@ -662,6 +662,7 @@ Executable git-annex
|
||||||
Build.EvilSplicer
|
Build.EvilSplicer
|
||||||
Build.InstallDesktopFile
|
Build.InstallDesktopFile
|
||||||
Build.LinuxMkLibs
|
Build.LinuxMkLibs
|
||||||
|
Build.MakeMans
|
||||||
Build.Mans
|
Build.Mans
|
||||||
Build.NullSoftInstaller
|
Build.NullSoftInstaller
|
||||||
Build.OSXMkLibs
|
Build.OSXMkLibs
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue