response

1 files changed, 9 insertions, 4 deletions

diff --git a/Setup.hs b/Setup.hs
index 0a491c7d5..15447b0e3 100644
--- a/Setup.hs
+++ b/Setup.hs
@@ -13,6 +13,7 @@ import System.FilePath
 import Control.Applicative
 import Control.Monad
 import System.Directory
+import Data.List
 
 import qualified Build.DesktopFile as DesktopFile
 import qualified Build.Configure as Configure
@@ -51,10 +52,14 @@ installManpages copyDest verbosity pkg lbi =
 	installOrdinaryFiles verbosity dstManDir =<< srcManpages
   where
 	dstManDir   = mandir (absoluteInstallDirs pkg lbi copyDest) </> "man1"
-	srcManpages = zip (repeat srcManDir)
-		<$> filterM doesFileExist manpages
-	srcManDir   = ""
-	manpages    = ["git-annex.1", "git-annex-shell.1"]
+	srcManpages = do
+		havemans <- doesDirectoryExist srcManDir
+		if havemans
+			then zip (repeat srcManDir)
+				. filter (".1" `isSuffixOf`)
+				<$> getDirectoryContents srcManDir
+			else return []
+	srcManDir   = "man"
 
 installDesktopFile :: CopyDest -> Verbosity -> PackageDescription -> LocalBuildInfo -> IO ()
 installDesktopFile copyDest _verbosity pkg lbi =