diff options
| author | panne <unknown> | 2004-02-20 21:21:27 +0000 |
|---|---|---|
| committer | panne <unknown> | 2004-02-20 21:21:27 +0000 |
| commit | bfff14e76f8781c5187b4618f1f6acb9036f3ba9 (patch) | |
| tree | c4a1de3d35643e4c61bd0bf6153aed7726f143a5 /ghc/Makefile | |
| parent | 73b9cebbd800a19c55798037c0a3658006c382cb (diff) | |
| download | haskell-bfff14e76f8781c5187b4618f1f6acb9036f3ba9.tar.gz | |
[project @ 2004-02-20 21:21:27 by panne]
Reverted previous commit, it was fixing things in the wrong place: When e.g.
"make dvi" is issued, we should *always* descend into the docs directory.
Generally, the SGMLDocWays-handling seems to be a bit a wrong: We should not
change how make descends down the hierarchy, but should make it a no-op when
nothing should/can be done.
Diffstat (limited to 'ghc/Makefile')
| -rw-r--r-- | ghc/Makefile | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/ghc/Makefile b/ghc/Makefile index dbc8017538..3524757263 100644 --- a/ghc/Makefile +++ b/ghc/Makefile @@ -1,5 +1,5 @@ #----------------------------------------------------------------------------- -# $Id: Makefile,v 1.24 2004/02/12 02:11:34 mthomas Exp $ +# $Id: Makefile,v 1.25 2004/02/20 21:21:27 panne Exp $ # TOP=. @@ -20,24 +20,14 @@ include $(TOP)/mk/boilerplate.mk # If we're booting from .hc files, swap the order # we descend into subdirs - to boot utils must be before driver. # - -# First - check whether we should build the docs directory. -# On Windows, the tools to build docs are not always available. - -ifneq "$(SGMLDocWays)" "" -DOCS_DIR = docs -else -DOCS_DIR = -endif - ifeq "$(BootingFromHc)" "YES" -SUBDIRS = includes rts $(DOCS_DIR) compiler utils driver +SUBDIRS = includes rts docs compiler utils driver else ifneq "$(ILXized)" "YES" -SUBDIRS = includes utils driver $(DOCS_DIR) compiler rts +SUBDIRS = includes utils driver docs compiler rts else # No RTS for ILX -SUBDIRS = includes utils driver $(DOCS_DIR) compiler +SUBDIRS = includes utils driver docs compiler endif endif |