Remove the duplicate show rule in libraries/Makefile

[ghc-hetmet.git] / libraries / Makefile

diff --git a/libraries/Makefile b/libraries/Makefile
index a2729dc..63945c5 100644 (file)
--- a/libraries/Makefile
+++ b/libraries/Makefile
@@ -20,13 +20,10 @@
 #   [ -e foo/configure.ac ] && ( cd foo && autoreconf )
 #   make make.library.foo
 
-.PHONY: default_target show
+.PHONY: default_target
 
 default_target: all
 
-show:
-       @echo '$(VALUE)="$($(VALUE))"'
-
 # make doesn't give us an easy way to get the libraries built in
 # dependency order the first time, but not rebuild base (for example)
 # when we want to rebuild another library later.
@@ -41,7 +38,7 @@ include $(TOP)/mk/cabal-flags.mk
 
 # Any libraries listed here should also be in ../packages
 
-SUBDIRS  = ghc-prim $(INTEGER_LIBRARY) base syb concurrent unique timeout st getopt base3-compat array packedstring
+SUBDIRS  = ghc-prim $(INTEGER_LIBRARY) base syb base3-compat array packedstring
 SUBDIRS += containers bytestring old-locale old-time filepath 
 ifeq "$(GhcLibsWithUnix)" "YES"
 SUBDIRS += unix
@@ -89,37 +86,6 @@ ifeq "$(ghc_ge_609)" "YES"
 GhcLibHcOpts += -fno-warn-deprecated-flags
 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
 
 ifneq "$(DOING_BIN_DIST)" "YES"
@@ -164,7 +130,7 @@ BOOTSTRAPPING_FLAGS = $(CABAL_GHC_FLAGS) -DCABAL_VERSION=$(CABAL_VERSION) -odir
 boot: ifBuildable/ifBuildable cabal-bin bootstrapping.conf
 
 cabal-bin: cabal-bin.hs
-       mkdir bootstrapping
+       -mkdir bootstrapping
        $(GHC) $(BOOTSTRAPPING_FLAGS) --make cabal-bin -o cabal-bin
 
 bootstrapping.conf: cabal-bin
@@ -197,10 +163,6 @@ endif
 
 all: build
 
-ifeq "$(HADDOCK_DOCS)" "YES"
-all: doc
-endif
-
 .PHONY: rebuild.library.%
 .PHONY: remake.library.%
 
@@ -295,8 +257,9 @@ doc: $(foreach SUBDIR,$(DOC_SUBDIRS),doc.library.$(SUBDIR))
 
 # Making hyperlinked source only works if we have hscolour
 ifneq "$(HSCOLOUR)" ""
-CABAL_HADDOCK_FLAGS=--hyperlink-source
+CABAL_HADDOCK_FLAGS += --hyperlink-source
 endif
+CABAL_HADDOCK_FLAGS += --with-haddock=$(FPTOOLS_TOP_ABS)/utils/haddock/install-inplace/bin/haddock
 
 $(foreach SUBDIR,$(DOC_SUBDIRS),doc.library.$(SUBDIR)):\
 doc.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \
@@ -378,7 +341,7 @@ $(foreach SUBDIR,$(SUBDIRS),install.library.$(SUBDIR)): \
 install.library.%: ifBuildable/ifBuildable
        if $(IFBUILDABLE) $*; then \
          cd $* && \
-         $(INSTALL_PACKAGE) install '$(DESTDIR)$(bindir)/ghc-pkg' '$(DESTDIR)$(datadir)/package.conf' '$(DESTDIR)' '$(prefix)' '$(iprefix)' '$(ibindir)' '$(ilibdir)' '$(ilibexecdir)' '$(idynlibdir)' '$(idatadir)' '$(idocdir)' '$(ihtmldir)' '$(ihaddockdir)' ; \
+         $(INSTALL_PACKAGE) install '$(GHC_PKG_INSTALL_PROG)' '$(DESTDIR)$(datadir)/package.conf' '$(DESTDIR)' '$(prefix)' '$(iprefix)' '$(ibindir)' '$(ilibdir)' '$(ilibexecdir)' '$(idynlibdir)' '$(idatadir)' '$(idocdir)' '$(ihtmldir)' '$(ihaddockdir)' ; \
        fi
 
 .PHONY: binary-dist binary-dist.library.%