diff --git a/Commands.hs b/Commands.hs index 199b83abf6..330b71ed27 100644 --- a/Commands.hs +++ b/Commands.hs @@ -47,8 +47,8 @@ type SubCmdCleanup = Annex Bool {- Some helper functions are used to build up SubCmdSeek and SubCmdStart - functions. -} type SubCmdSeekStrings = SubCmdStartString -> SubCmdSeek -type SubCmdSeekBackendFiles = SubCmdStartBackendFile -> SubCmdSeek type SubCmdStartString = String -> SubCmdStart +type SubCmdSeekBackendFiles = SubCmdStartBackendFile -> SubCmdSeek type SubCmdStartBackendFile = (FilePath, Maybe Backend) -> SubCmdStart data SubCommand = SubCommand { diff --git a/Makefile b/Makefile index ed262333a3..5e27c1e904 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,7 @@ install: # If ikiwiki is available, build static html docs suitable for being # shipped in the software package. ifeq ($(shell which ikiwiki),) -IKIWIKI=echo "** ikiwiki not found, skipping building docs" >&2 +IKIWIKI=@echo "** ikiwiki not found, skipping building docs" >&2; true else IKIWIKI=ikiwiki endif