projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
We need to set _way=* in rts/ both when making and installing bindists
[ghc-hetmet.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
287754a
..
acee11b
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-64,7
+64,7
@@
else
SUBDIRS_BUILD = gmp includes compat utils driver docs compiler rts
endif
SUBDIRS_BUILD = gmp includes compat utils driver docs compiler rts
endif
-SUBDIRS = gmp includes compat utils driver docs rts libraries compiler
+SUBDIRS = gmp includes compat utils driver docs rts libraries compiler libraries/Cabal/doc
# Sanity check that all the boot libraries are in the tree, to catch
# failure to run darcs-all.
# Sanity check that all the boot libraries are in the tree, to catch
# failure to run darcs-all.
@@
-307,6
+307,7
@@
binary-dist::
$(MAKE) -C utils binary-dist DOING_BIN_DIST=YES
$(MAKE) -C docs binary-dist DOING_BIN_DIST=YES
$(MAKE) -C libraries binary-dist DOING_BIN_DIST=YES
$(MAKE) -C utils binary-dist DOING_BIN_DIST=YES
$(MAKE) -C docs binary-dist DOING_BIN_DIST=YES
$(MAKE) -C libraries binary-dist DOING_BIN_DIST=YES
+ $(MAKE) -C libraries/Cabal/doc binary-dist DOING_BIN_DIST=YES
VARFILE=$(BIN_DIST_DIR)/Makefile-vars.in
VARFILE=$(BIN_DIST_DIR)/Makefile-vars.in
@@
-328,6
+329,11
@@
binary-dist::
echo "GhcHasReadline = $(GhcHasReadline)" >> $(VARFILE)
echo "BootingFromHc = $(BootingFromHc)" >> $(VARFILE)
echo "XMLDocWays = $(XMLDocWays)" >> $(VARFILE)
echo "GhcHasReadline = $(GhcHasReadline)" >> $(VARFILE)
echo "BootingFromHc = $(BootingFromHc)" >> $(VARFILE)
echo "XMLDocWays = $(XMLDocWays)" >> $(VARFILE)
+ # We won't actually use xsltproc, but we need to know if it's "" or not
+ echo "XSLTPROC = $(XSLTPROC)" >> $(VARFILE)
+ echo "TARGETPLATFORM = $(TARGETPLATFORM)" >> $(VARFILE)
+ echo "HADDOCK_DOCS = $(HADDOCK_DOCS)" >> $(VARFILE)
+
cat distrib/Makefile-bin-vars.in >> $(VARFILE)
@echo "Generating a shippable configure script.."
$(MV) $(BIN_DIST_DIR)/configure-bin.ac $(BIN_DIST_DIR)/configure.ac
cat distrib/Makefile-bin-vars.in >> $(VARFILE)
@echo "Generating a shippable configure script.."
$(MV) $(BIN_DIST_DIR)/configure-bin.ac $(BIN_DIST_DIR)/configure.ac
@@
-414,7
+420,7
@@
SRC_DIST_DIR=$(shell pwd)/$(SRC_DIST_NAME)
#
# Files to include in source distributions
#
#
# Files to include in source distributions
#
-SRC_DIST_DIRS += mk docs distrib bindisttest $(filter-out docs distrib,$(SUBDIRS))
+SRC_DIST_DIRS += mk docs distrib bindisttest $(filter-out docs distrib libraries/Cabal/doc,$(SUBDIRS))
SRC_DIST_FILES += \
configure.ac config.guess config.sub configure \
aclocal.m4 README ANNOUNCE HACKING LICENSE Makefile install-sh \
SRC_DIST_FILES += \
configure.ac config.guess config.sub configure \
aclocal.m4 README ANNOUNCE HACKING LICENSE Makefile install-sh \