From 73cf58da2339878a91b748ad3849d59514065edf Mon Sep 17 00:00:00 2001
From: Krasimir Angelov <kr.angelov@gmail.com>
Date: Thu, 5 Jul 2018 13:10:02 +0200
Subject: [PATCH] revert to a version compatible with Cabal 1.22

---
 Setup.hs | 10 +++++-----
 gf.cabal |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Setup.hs b/Setup.hs
index aa78dd19c..d1bc4439c 100644
--- a/Setup.hs
+++ b/Setup.hs
@@ -4,11 +4,11 @@ import Distribution.Simple.BuildPaths(exeExtension)
 import Distribution.Simple.Utils(intercalate)
 import Distribution.Simple.Setup(BuildFlags(..),Flag(..),InstallFlags(..),CopyDest(..),CopyFlags(..),SDistFlags(..))
 import Distribution.PackageDescription(PackageDescription(..),HookedBuildInfo(..),emptyHookedBuildInfo)
-import Control.Monad(unless)
+import Control.Monad(unless,when)
 import Data.List(isPrefixOf,intersect)
 import System.Process(readProcess)
 import System.FilePath((</>),(<.>))
-import System.Directory(createDirectoryIfMissing,copyFile,getDirectoryContents,listDirectory)
+import System.Directory(createDirectoryIfMissing,copyFile,getDirectoryContents)
 
 import WebSetup
 
@@ -71,8 +71,8 @@ rglCommands =
        let prelude_src_dir = rgl_src_dir    </> "prelude"
            prelude_dst_dir = rgl_dst_dir (lbi bi) </> "prelude"
        createDirectoryIfMissing True prelude_dst_dir
-       files <- listDirectory prelude_src_dir
-       run_gfc bi (["-s", "--gfo-dir="++prelude_dst_dir] ++ [prelude_src_dir </> file | file <- files])
+       files <- getDirectoryContents prelude_src_dir
+       run_gfc bi (["-s", "--gfo-dir="++prelude_dst_dir] ++ [prelude_src_dir </> file | file <- files, file /= "." && file /= ".."])
 
   , RGLCommand "all"     True  $ gfcp [l,s,c,t,sc]
   , RGLCommand "lang"    False $ gfcp [l,s]
@@ -158,7 +158,7 @@ copyAll :: String -> FilePath -> FilePath -> IO ()
 copyAll s from to = do
   putStrLn $ "Installing [" ++ s ++ "] " ++ to
   createDirectoryIfMissing True to
-  mapM_ (\file -> copyFile (from </> file) (to </> file)) =<< listDirectory from
+  mapM_ (\file -> when (file /= "." && file /= "..") $ copyFile (from </> file) (to </> file)) =<< getDirectoryContents from
 
 {-
 sdistRGL :: PackageDescription -> Maybe LocalBuildInfo -> UserHooks -> SDistFlags -> IO ()
diff --git a/gf.cabal b/gf.cabal
index b324be214..3e63fdd79 100644
--- a/gf.cabal
+++ b/gf.cabal
@@ -1,7 +1,7 @@
 name: gf
 version: 3.9-git
 
-cabal-version: >= 1.24
+cabal-version: >= 1.22
 build-type: Custom
 license: OtherLicense
 license-file: LICENSE