Merge pull request #6055 from zw3rk/fix-datadir

Fix datadir path in generated `Paths_` file
haskell · May 24, 2019 · 11047e4 · 11047e4
2 parents 27ef964 + 5f55491
commit 11047e4
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 15 deletions.
diff --git a/Cabal/Distribution/Simple/Build/PathsModule.hs b/Cabal/Distribution/Simple/Build/PathsModule.hs
@@ -195,7 +195,8 @@ generate pkg_descr lbi clbi =
           datadir    = flat_datadir,
           libexecdir = flat_libexecdir,
           sysconfdir = flat_sysconfdir
-        } = absoluteComponentInstallDirs pkg_descr lbi cid NoCopyDest
+        } = absoluteInstallCommandDirs pkg_descr lbi cid NoCopyDest
+
         InstallDirs {
           bindir     = flat_bindirrel,
           libdir     = flat_libdirrel,

diff --git a/Cabal/Distribution/Simple/Install.hs b/Cabal/Distribution/Simple/Install.hs
@@ -97,21 +97,10 @@ copyPackage verbosity pkg_descr lbi distPref copydest = do
       -- per-component (data files and Haddock files.)
       InstallDirs {
          datadir    = dataPref,
-         -- NB: The situation with Haddock is a bit delicate.  On the
-         -- one hand, the easiest to understand Haddock documentation
-         -- path is pkgname-0.1, which means it's per-package (not
-         -- per-component).  But this means that it's impossible to
-         -- install Haddock documentation for internal libraries.  We'll
-         -- keep this constraint for now; this means you can't use
-         -- Cabal to Haddock internal libraries.  This does not seem
-         -- like a big problem.
          docdir     = docPref,
          htmldir    = htmlPref,
-         haddockdir = interfacePref}
-             -- Notice use of 'absoluteInstallDirs' (not the
-             -- per-component variant).  This means for non-library
-             -- packages we'll just pick a nondescriptive foo-0.1
-             = absoluteInstallDirs pkg_descr lbi copydest
+         haddockdir = interfacePref
+      } = absoluteInstallCommandDirs pkg_descr lbi (localUnitId lbi) copydest
 
   -- Install (package-global) data files
   installDataFiles verbosity pkg_descr dataPref
@@ -161,7 +150,7 @@ copyComponent verbosity pkg_descr lbi (CLib lib) clbi copydest = do
             libdir = libPref,
             dynlibdir = dynlibPref,
             includedir = incPref
-            } = absoluteComponentInstallDirs pkg_descr lbi (componentUnitId clbi) copydest
+            } = absoluteInstallCommandDirs pkg_descr lbi (componentUnitId clbi) copydest
         buildPref = componentBuildDir lbi clbi
 
     case libName lib of

diff --git a/Cabal/Distribution/Simple/LocalBuildInfo.hs b/Cabal/Distribution/Simple/LocalBuildInfo.hs
@@ -57,6 +57,7 @@ module Distribution.Simple.LocalBuildInfo (
         -- * Installation directories
         module Distribution.Simple.InstallDirs,
         absoluteInstallDirs, prefixRelativeInstallDirs,
+        absoluteInstallCommandDirs,
         absoluteComponentInstallDirs, prefixRelativeComponentInstallDirs,
         substPathTemplate,
   ) where
@@ -302,6 +303,34 @@ absoluteComponentInstallDirs pkg lbi uid copydest =
     (hostPlatform lbi)
     (installDirTemplates lbi)
 
+absoluteInstallCommandDirs :: PackageDescription -> LocalBuildInfo
+                           -> UnitId
+                           -> CopyDest
+                           -> InstallDirs FilePath
+absoluteInstallCommandDirs pkg lbi uid copydest =
+  dirs {
+    -- Handle files which are not
+    -- per-component (data files and Haddock files.)
+    datadir    = datadir    dirs',
+    -- NB: The situation with Haddock is a bit delicate.  On the
+    -- one hand, the easiest to understand Haddock documentation
+    -- path is pkgname-0.1, which means it's per-package (not
+    -- per-component).  But this means that it's impossible to
+    -- install Haddock documentation for internal libraries.  We'll
+    -- keep this constraint for now; this means you can't use
+    -- Cabal to Haddock internal libraries.  This does not seem
+    -- like a big problem.
+    docdir     = docdir     dirs',
+    htmldir    = htmldir    dirs',
+    haddockdir = haddockdir dirs'
+    }
+  where
+    dirs  = absoluteComponentInstallDirs pkg lbi uid copydest
+    -- Notice use of 'absoluteInstallDirs' (not the
+    -- per-component variant).  This means for non-library
+    -- packages we'll just pick a nondescriptive foo-0.1
+    dirs' = absoluteInstallDirs pkg lbi copydest
+
 -- | Backwards compatibility function which computes the InstallDirs
 -- assuming that @$libname@ points to the public library (or some fake
 -- package identifier if there is no public library.)  IF AT ALL