ilibdir = $$topdir
ilibexecdir = $$topdir
idatadir = $$topdir
-idocdir = $$topdir/doc/libraries/$$pkg
-ihtmldir = $$topdir/doc/libraries/$$pkg
+idocdir = $$topdir/doc/libraries/$$pkgid
+ihtmldir = $$topdir/doc/libraries/$$pkgid
html_installed_root = $(prefix)/doc/libraries
else
# On non-Windows we can just give absolute paths all the time, and
ilibdir = $(libdir)
ilibexecdir = $(libexecdir)
idatadir = $(datadir)
-idocdir = $(docdir)/libraries/$$pkg
-ihtmldir = $(htmldir)/libraries/$$pkg
-html_installed_root = $(ihtmldir)
+idocdir = $(docdir)/libraries/$$pkgid
+ihtmldir = $(htmldir)/libraries/$$pkgid
+html_installed_root = $(htmldir)/libraries
endif
ifneq "$(DOING_BIN_DIST)" "YES"
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: 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).% \
%/setup/Setup ifBuildable/ifBuildable
if ifBuildable/ifBuildable $*; then \
- cd $* && setup/Setup haddock --html-location='../$$pkg'; \
+ cd $* && setup/Setup haddock --html-location='../$$pkgid'; \
fi
.PHONY: distclean clean clean.library.%
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.%: