Restore the static prefix to glob matches. Oops.

Author: quasicomputational

Cabal/Distribution/Simple/Glob.hs

@@ -30,7 +30,7 @@ import Distribution.Simple.Utils
 import Distribution.Verbosity
 import Distribution.Version
 
-import System.FilePath (joinPath, splitExtensions, splitPath, takeExtensions)
+import System.FilePath (joinPath, splitExtensions, splitPath, takeExtensions, (</>))
 
 data GlobSyntaxError
   = StarInDirectory
@@ -135,6 +135,7 @@ parseFileGlob version filepath = case reverse (splitPath filepath) of
 matchFileGlob :: Verbosity -> Version -> FilePath -> IO [FilePath]
 matchFileGlob verbosity version = matchDirFileGlob verbosity version "."
 
+-- The returned values do not include the supplied @dir@ prefix.
 matchDirFileGlob :: Verbosity -> Version -> FilePath -> FilePath -> IO [FilePath]
 matchDirFileGlob verbosity version dir filepath = case parseFileGlob version filepath of
   Left err -> die' verbosity $ explainGlobSyntaxError filepath err
@@ -146,13 +147,14 @@ matchDirFileGlob verbosity version dir filepath = case parseFileGlob version fil
     -- there. If the pattern is **/*.blah, then of course we'll have
     -- to walk the whole thing anyway, but that's what the user asked
     -- for!
-    let (prefix, pat') = splitConstantPrefix pat
-    files <- getDirectoryContentsRecursive $ joinPath (dir : prefix)
+    let (prefixSegments, pat') = splitConstantPrefix pat
+        joinedPrefix = joinPath prefixSegments
+    files <- getDirectoryContentsRecursive (dir </> joinedPrefix)
     case filter (fileGlobMatches pat') files of
       []      -> die' verbosity $
            "filepath wildcard '" ++ filepath
         ++ "' does not match any files."
-      matches -> return matches
+      matches -> return $ fmap (joinedPrefix </>) matches
 
 unfoldr' :: (a -> Either r (b, a)) -> a -> ([b], r)
 unfoldr' f a = case f a of