diff options
| author | Ian Lynagh <igloo@earth.li> | 2008-09-06 14:25:46 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2008-09-06 14:25:46 +0000 |
| commit | 0fd755820053238e8f739356e8ff6420f87119f4 (patch) | |
| tree | 810343202b0994a0bf53310534189eb04af406d6 /mk | |
| parent | 0db68e1cf9b83d2d18ba427ec28712de4c9a043f (diff) | |
| download | haskell-0fd755820053238e8f739356e8ff6420f87119f4.tar.gz | |
Install the stage 2 ghc package when installing; fixes trac #2567
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/cabal-flags.mk | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/mk/cabal-flags.mk b/mk/cabal-flags.mk index d69999f9b0..2e743574cb 100644 --- a/mk/cabal-flags.mk +++ b/mk/cabal-flags.mk @@ -88,3 +88,37 @@ USE_STAGE2_CONFIGURE_FLAGS = \ BUILD_FLAGS = $(addprefix --ghc-option=,$(SRC_HC_OPTS)) + +# We now define various i* variables, which are used for the paths +# when installing Cabal libraries +ifeq "$(RelocatableBuild)" "YES" +# On Windows we want to make moveable bindists, but we need to tell +# ghc-pkg where the haddock docs are. Therefore we completely ignore +# where the user tells us to put the haddock documentation and put it +# somewhere whose relative location we know. When installing we need +# to give Cabal a real path, though. +iprefix = $$topdir +ibindir = $$topdir +ilibdir = $$topdir +ilibexecdir = $$topdir +idynlibdir = $$topdir +idatadir = $$topdir +idocdir = $$topdir/doc/libraries/$$pkg +ihaddockdir = $$topdir/doc/libraries/$$pkg +ihtmldir = $$httptopdir/doc/libraries/$$pkg +html_installed_root = $(prefix)/doc/libraries +else +# On non-Windows we can just give absolute paths all the time, and +# thus obey the htmldir that we are given. +iprefix = $(prefix) +ibindir = $(bindir) +ilibdir = $(libdir) +ilibexecdir = $(libexecdir) +idynlibdir = $(dynlibdir) +idatadir = $(datadir) +idocdir = $(docdir)/libraries/$$pkg +ihaddockdir = $(htmldir)/libraries/$$pkg +ihtmldir = $(htmldir)/libraries/$$pkg +html_installed_root = $(htmldir)/libraries +endif + |