Fix prelude.inc handling in .cabal to make new-install work

Hopefully fixes both #162 and #200.
pull/210/head
Lennart Spitzner 2018-11-30 00:17:25 +01:00
parent 621e00bf3f
commit 784e4d0aed
1 changed files with 7 additions and 5 deletions

View File

@ -25,6 +25,7 @@ extra-doc-files: {
} }
extra-source-files: { extra-source-files: {
src-literatetests/*.blt src-literatetests/*.blt
srcinc/prelude.inc
} }
source-repository head { source-repository head {
@ -42,9 +43,8 @@ library {
Haskell2010 Haskell2010
hs-source-dirs: hs-source-dirs:
src src
install-includes: { include-dirs:
srcinc/prelude.inc srcinc
}
exposed-modules: { exposed-modules: {
Language.Haskell.Brittany Language.Haskell.Brittany
Language.Haskell.Brittany.Internal Language.Haskell.Brittany.Internal
@ -130,8 +130,6 @@ library {
MultiWayIf MultiWayIf
KindSignatures KindSignatures
} }
include-dirs:
srcinc
} }
executable brittany executable brittany
@ -179,6 +177,7 @@ executable brittany
, filepath >=1.4.1.0 && <1.5 , filepath >=1.4.1.0 && <1.5
} }
hs-source-dirs: src-brittany hs-source-dirs: src-brittany
include-dirs: srcinc
default-language: Haskell2010 default-language: Haskell2010
default-extensions: { default-extensions: {
CPP CPP
@ -249,6 +248,7 @@ test-suite unittests
other-modules: TestUtils other-modules: TestUtils
AsymptoticPerfTests AsymptoticPerfTests
hs-source-dirs: src-unittests hs-source-dirs: src-unittests
include-dirs: srcinc
default-extensions: { default-extensions: {
CPP CPP
@ -321,6 +321,7 @@ test-suite littests
main-is: Main.hs main-is: Main.hs
other-modules: other-modules:
hs-source-dirs: src-literatetests hs-source-dirs: src-literatetests
include-dirs: srcinc
default-extensions: { default-extensions: {
CPP CPP
@ -362,6 +363,7 @@ test-suite libinterfacetests
main-is: Main.hs main-is: Main.hs
other-modules: other-modules:
hs-source-dirs: src-libinterfacetests hs-source-dirs: src-libinterfacetests
include-dirs: srcinc
default-extensions: { default-extensions: {
FlexibleContexts FlexibleContexts
FlexibleInstances FlexibleInstances