projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix the libraries Makefile
[ghc-hetmet.git]
/
libraries
/
Makefile
diff --git
a/libraries/Makefile
b/libraries/Makefile
index
190e9ce
..
bbcfdd2
100644
(file)
--- a/
libraries/Makefile
+++ b/
libraries/Makefile
@@
-95,9
+95,9
@@
ibindir = $$topdir
ilibdir = $$topdir
ilibexecdir = $$topdir
idatadir = $$topdir
ilibdir = $$topdir
ilibexecdir = $$topdir
idatadir = $$topdir
-idocdir = $$topdir/doc/libraries/$$pkgid
-iinterfacedir = $$topdir/doc/libraries/$$pkgid
-ihtmldir = $$httptopdir/doc/libraries/$$pkgid
+idocdir = $$topdir/doc/libraries/$$pkg
+iinterfacedir = $$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
html_installed_root = $(prefix)/doc/libraries
else
# On non-Windows we can just give absolute paths all the time, and
@@
-107,9
+107,9
@@
ibindir = $(bindir)
ilibdir = $(libdir)
ilibexecdir = $(libexecdir)
idatadir = $(datadir)
ilibdir = $(libdir)
ilibexecdir = $(libexecdir)
idatadir = $(datadir)
-idocdir = $(docdir)/libraries/$$pkgid
-iinterfacedir = $(htmldir)/libraries/$$pkgid
-ihtmldir = $(htmldir)/libraries/$$pkgid
+idocdir = $(docdir)/libraries/$$pkg
+iinterfacedir = $(htmldir)/libraries/$$pkg
+ihtmldir = $(htmldir)/libraries/$$pkg
html_installed_root = $(htmldir)/libraries
endif
html_installed_root = $(htmldir)/libraries
endif
@@
-296,9
+296,12
@@
$(foreach SUBDIR,$(SUBDIRS),doc.library.$(SUBDIR)):\
doc.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \
%/setup/Setup ifBuildable/ifBuildable
if ifBuildable/ifBuildable $*; then \
doc.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \
%/setup/Setup ifBuildable/ifBuildable
if ifBuildable/ifBuildable $*; then \
- cd $* && setup/Setup haddock --html-location='../$$pkgid' \
+ cd $* && setup/Setup haddock --html-location='../$$pkg' \
$(CABAL_HADDOCK_FLAGS); \
fi
$(CABAL_HADDOCK_FLAGS); \
fi
+ifneq "$(HSCOLOUR)" ""
+ if ifBuildable/ifBuildable $*; then cp hscolour.css $*/dist/doc/html/$*/src/; fi
+endif
.PHONY: distclean clean clean.library.%
.PHONY: distclean clean clean.library.%
@@
-375,10
+378,6
@@
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.%:
@@
-389,6
+388,7
@@
binary-dist.library.%:
cp LICENSE $(BIN_DIST_LIBDIR)/$* && \
cp -R dist $(BIN_DIST_LIBDIR)/$* && \
$(FIND) . -name "*.buildinfo" -exec cp {} $(BIN_DIST_LIBDIR)/$* \; && \
cp LICENSE $(BIN_DIST_LIBDIR)/$* && \
cp -R dist $(BIN_DIST_LIBDIR)/$* && \
$(FIND) . -name "*.buildinfo" -exec cp {} $(BIN_DIST_LIBDIR)/$* \; && \
+ $(FIND) . -name unbuildable -exec cp {} $(BIN_DIST_LIBDIR)/$* \; && \
(cp -RL include $(BIN_DIST_LIBDIR)/$* || true) && \
$(FIND) $(BIN_DIST_LIBDIR)/$*/dist \
\( -name "*_split" -o -name "autogen" \) | xargs rm -rf && \
(cp -RL include $(BIN_DIST_LIBDIR)/$* || true) && \
$(FIND) $(BIN_DIST_LIBDIR)/$*/dist \
\( -name "*_split" -o -name "autogen" \) | xargs rm -rf && \