Commit 0fd75582 authored by Ian Lynagh's avatar Ian Lynagh
Browse files

Install the stage 2 ghc package when installing; fixes trac #2567

parent 0db68e1c
...@@ -193,9 +193,8 @@ doc.stage.%: ...@@ -193,9 +193,8 @@ doc.stage.%:
--haddock-option=--optghc=-DSTAGE=$* \ --haddock-option=--optghc=-DSTAGE=$* \
--with-haddock=$(FPTOOLS_TOP_ABS)/utils/haddock/install-inplace/bin/haddock --with-haddock=$(FPTOOLS_TOP_ABS)/utils/haddock/install-inplace/bin/haddock
# XXX We ought to actually install the (stage 2) library
install: install:
@: $(INSTALL_PACKAGE) install '$(GHC_PKG_INSTALL_PROG)' '$(DESTDIR)$(datadir)/package.conf' '$(DESTDIR)' '$(prefix)' '$(iprefix)' '$(ibindir)' '$(ilibdir)' '$(ilibexecdir)' '$(idynlibdir)' '$(idatadir)' '$(idocdir)' '$(ihtmldir)' '$(ihaddockdir)' --distpref dist-stage2
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
# Create compiler configuration # Create compiler configuration
......
...@@ -3,7 +3,7 @@ Name: ghc ...@@ -3,7 +3,7 @@ Name: ghc
Version: 6.9 Version: 6.9
Copyright: XXX Copyright: XXX
-- License: XXX -- License: XXX
License-File: XXX License-File: ../LICENSE
Author: XXX Author: XXX
Maintainer: glasgow-haskell-users@haskell.org Maintainer: glasgow-haskell-users@haskell.org
Homepage: http://www.haskell.org/ghc/ Homepage: http://www.haskell.org/ghc/
......
...@@ -89,37 +89,6 @@ ifeq "$(ghc_ge_609)" "YES" ...@@ -89,37 +89,6 @@ ifeq "$(ghc_ge_609)" "YES"
GhcLibHcOpts += -fno-warn-deprecated-flags GhcLibHcOpts += -fno-warn-deprecated-flags
endif endif
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
IFBUILDABLE=ifBuildable/ifBuildable $(FPTOOLS_TOP_ABS)/packages IFBUILDABLE=ifBuildable/ifBuildable $(FPTOOLS_TOP_ABS)/packages
ifneq "$(DOING_BIN_DIST)" "YES" ifneq "$(DOING_BIN_DIST)" "YES"
......
...@@ -88,3 +88,37 @@ USE_STAGE2_CONFIGURE_FLAGS = \ ...@@ -88,3 +88,37 @@ USE_STAGE2_CONFIGURE_FLAGS = \
BUILD_FLAGS = $(addprefix --ghc-option=,$(SRC_HC_OPTS)) 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
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment