- updated pkgdir patch

diff --git a/ghc-pkgdir.patch b/ghc-pkgdir.patch
index ed415e78ae1035f9beb51fd54958d0ba54821268..eb836a9eaa5b68c9a3ef005c2ae65b233a5cf3a0 100644 (file)
--- a/ghc-pkgdir.patch
+++ b/ghc-pkgdir.patch
@@ -4,17 +4,31 @@
  -- users to be able to configure @--libdir=\/usr\/lib64@ for example but
  -- because by default we want to support installing multiple versions of
  -- packages and building the same package for multiple compilers we append the
---- libsubdir to get: @\/usr\/lib64\/$pkgid\/$compiler@.
-+-- libsubdir to get: @\/usr\/lib64\/$compiler\/$pkgid@.
+--- libsubdir to get: @\/usr\/lib64\/$libname\/$compiler@.
++-- libsubdir to get: @\/usr\/lib64\/$compiler\/$libname@.
  --
  -- An additional complication is the need to support relocatable packages on
  -- systems which support such things, like Windows.
-@@ -236,7 +236,7 @@
-            JHC    -> "$compiler"
-            LHC    -> "$compiler"
+@@ -204,11 +204,11 @@
+       libdir       = installLibDir,
+       libsubdir    = case comp of
             UHC    -> "$pkgid"
--           _other -> "$pkgid" </> "$compiler",
+-           _other -> "$abi" </> "$libname",
 +           _other -> "$compiler" </> "$pkgid",
-       dynlibdir    = "$libdir",
+       dynlibdir    = "$libdir" </> case comp of
+            UHC    -> "$pkgid"
+            _other -> "$abi",
+-      libexecsubdir= "$abi" </> "$pkgid",
++      libexecsubdir= "$pkgid",
+       flibdir      = "$libdir",
        libexecdir   = case buildOS of
-         Windows   -> "$prefix" </> "$pkgid"
+         Windows   -> "$prefix" </> "$libname"
+@@ -217,7 +217,7 @@
+       datadir      = case buildOS of
+         Windows   -> "$prefix"
+         _other    -> "$prefix" </> "share",
+-      datasubdir   = "$abi" </> "$pkgid",
++      datasubdir   = "$pkgid",
+       docdir       = "$datadir" </> "doc" </> "$abi" </> "$pkgid",
+       mandir       = "$datadir" </> "man",
+       htmldir      = "$docdir"  </> "html",

diff --git a/ghc.spec b/ghc.spec
index f54c8373cae5316e301698e9b15db4b8ad30f2a6..c5941d722af7b0757e527207991d0f1cdba55daa 100644 (file)
--- a/ghc.spec
+++ b/ghc.spec
@@ -293,7 +293,7 @@ cd ..
 %endif
 
 %patch0 -p1
-#%patch1 -p1
+%patch1 -p1
 #%patch2 -p1
 %patch3 -p1
 %patch4 -p1