summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2010-11-01 20:27:30 -0400
committerGravatar Joey Hess <joey@kitenet.net>2010-11-01 20:27:30 -0400
commite379307900ba571a5104f3bb2e7ad6c6900d3062 (patch)
treec5ca9bbf40d4d9c2a42eb0e4a46511d9469dec6e
parent82d5a46c5618c6d35ef7b85c5cc257875de4a34b (diff)
better message when ikiwiki is not available
-rw-r--r--Commands.hs2
-rw-r--r--Makefile2
2 files changed, 2 insertions, 2 deletions
diff --git a/Commands.hs b/Commands.hs
index 199b83abf..330b71ed2 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 ed262333a..5e27c1e90 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