projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More notes
[ghc-hetmet.git]
/
libraries
/
Makefile
diff --git
a/libraries/Makefile
b/libraries/Makefile
index
0e93ba0
..
713c1be
100644
(file)
--- a/
libraries/Makefile
+++ b/
libraries/Makefile
@@
-115,7
+115,7
@@
ilibexecdir = $(libexecdir)
idatadir = $(datadir)
idocdir = $(docdir)/libraries/$$pkgid
ihtmldir = $(htmldir)/libraries/$$pkgid
idatadir = $(datadir)
idocdir = $(docdir)/libraries/$$pkgid
ihtmldir = $(htmldir)/libraries/$$pkgid
-html_installed_root = $(ihtmldir)
+html_installed_root = $(htmldir)/libraries
endif
ifneq "$(DOING_BIN_DIST)" "YES"
endif
ifneq "$(DOING_BIN_DIST)" "YES"
@@
-140,8
+140,8
@@
endif
BOOTSTRAP_LIBS = Cabal filepath
BOOTSTRAP_STAMPS = $(addprefix stamp/bootstrapping.,$(BOOTSTRAP_LIBS))
BOOTSTRAP_LIBS = Cabal filepath
BOOTSTRAP_STAMPS = $(addprefix stamp/bootstrapping.,$(BOOTSTRAP_LIBS))
-BOOTSTRAP_INC_1_UP = $(addprefix -i../bootstrapping.,$(BOOTSTRAP_LIBS))
-BOOTSTRAP_INC_2_UP = $(addprefix -i../../bootstrapping.,$(BOOTSTRAP_LIBS))
+BOOTSTRAP_INC_1_UP = -DCABAL_VERSION=1,3 $(addprefix -i../bootstrapping.,$(BOOTSTRAP_LIBS))
+BOOTSTRAP_INC_2_UP = -DCABAL_VERSION=1,3 $(addprefix -i../../bootstrapping.,$(BOOTSTRAP_LIBS))
.PHONY: subdirs
.PHONY: subdirs
@@
-285,7
+285,7
@@
$(foreach SUBDIR,$(SUBDIRS),$(SUBDIR)/GNUmakefile):\
.PHONY: doc
doc: $(foreach SUBDIR,$(SUBDIRS),doc.library.$(SUBDIR))
.PHONY: doc
doc: $(foreach SUBDIR,$(SUBDIRS),doc.library.$(SUBDIR))
- sh gen_contents_index
+ sh gen_contents_index --inplace
$(foreach SUBDIR,$(SUBDIRS),doc.library.$(SUBDIR)):\
doc.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \
$(foreach SUBDIR,$(SUBDIRS),doc.library.$(SUBDIR)):\
doc.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \
@@
-368,6
+368,10
@@
ifeq "$(HADDOCK_DOCS)" "YES"
cp doc-index*.html $(BIN_DIST_LIBDIR)
endif
cp -pR stamp $(BIN_DIST_LIBDIR)
cp doc-index*.html $(BIN_DIST_LIBDIR)
endif
cp -pR stamp $(BIN_DIST_LIBDIR)
+ # This gets used in the compiler directory to see if GHC should
+ # depend on the readline package or not
+ $(MKDIRHIER) $(BIN_DIST_LIBDIR)/readline
+ cp readline/config.mk $(BIN_DIST_LIBDIR)/readline
$(foreach SUBDIR,$(SUBDIRS),binary-dist.library.$(SUBDIR)): \
binary-dist.library.%:
$(foreach SUBDIR,$(SUBDIRS),binary-dist.library.$(SUBDIR)): \
binary-dist.library.%: