projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix bug in popRunQueue
[ghc-hetmet.git]
/
ghc.mk
diff --git
a/ghc.mk
b/ghc.mk
index
7b29d6d
..
f8f0937
100644
(file)
--- a/
ghc.mk
+++ b/
ghc.mk
@@
-494,6
+494,7
@@
endif
BUILD_DIRS += \
docs/users_guide \
BUILD_DIRS += \
docs/users_guide \
+ docs/ext-core \
docs/man \
libraries/Cabal/doc \
$(GHC_UNLIT_DIR) \
docs/man \
libraries/Cabal/doc \
$(GHC_UNLIT_DIR) \
@@
-759,7
+760,7
@@
TAGS: TAGS_compiler
install: install_packages install_libs install_libexecs install_headers \
install_libexec_scripts install_bins install_docs \
install: install_packages install_libs install_libexecs install_headers \
install_libexec_scripts install_bins install_docs \
- install_topdirs install_topdir_scripts
+ install_topdirs
install_bins: $(INSTALL_BINS)
$(INSTALL_DIR) "$(DESTDIR)$(bindir)"
install_bins: $(INSTALL_BINS)
$(INSTALL_DIR) "$(DESTDIR)$(bindir)"
@@
-808,12
+809,6
@@
else
"$(MV)" "$(DESTDIR)$(ghclibexecdir)/ghc-stage2" "$(DESTDIR)$(ghclibexecdir)/ghc"
endif
"$(MV)" "$(DESTDIR)$(ghclibexecdir)/ghc-stage2" "$(DESTDIR)$(ghclibexecdir)/ghc"
endif
-install_topdir_scripts: $(INSTALL_TOPDIR_SCRIPTS)
- $(INSTALL_DIR) "$(DESTDIR)$(topdir)"
- for i in $(INSTALL_TOPDIR_SCRIPTS); do \
- $(INSTALL_SCRIPT) $(INSTALL_OPTS) $$i "$(DESTDIR)$(topdir)"; \
- done
-
install_topdirs: $(INSTALL_TOPDIRS)
$(INSTALL_DIR) "$(DESTDIR)$(topdir)"
for i in $(INSTALL_TOPDIRS); do \
install_topdirs: $(INSTALL_TOPDIRS)
$(INSTALL_DIR) "$(DESTDIR)$(topdir)"
for i in $(INSTALL_TOPDIRS); do \
@@
-862,7
+857,11
@@
INSTALLED_GHC_REAL=$(DESTDIR)$(bindir)/ghc.exe
INSTALLED_GHC_PKG_REAL=$(DESTDIR)$(bindir)/ghc-pkg.exe
endif
INSTALLED_GHC_PKG_REAL=$(DESTDIR)$(bindir)/ghc-pkg.exe
endif
-INSTALLED_PACKAGES = $(filter-out haskeline mtl terminfo utf8-string,$(PACKAGES))
+INSTALLED_PACKAGES := $(filter-out haskeline mtl terminfo utf8-string,$(PACKAGES))
+ifeq "$(InstallExtraPackages)" "NO"
+INSTALLED_PACKAGES := $(filter-out $(EXTRA_PACKAGES), $(INSTALLED_PACKAGES))
+endif
+
HIDDEN_PACKAGES = binary
define set_INSTALL_DISTDIR
HIDDEN_PACKAGES = binary
define set_INSTALL_DISTDIR
@@
-919,6
+918,7
@@
$(eval $(call bindist,.,\
$(INPLACE_BIN)/ghc-cabal \
utils/ghc-pwd/ghc-pwd \
$(BINDIST_WRAPPERS) \
$(INPLACE_BIN)/ghc-cabal \
utils/ghc-pwd/ghc-pwd \
$(BINDIST_WRAPPERS) \
+ $(BINDIST_PERL_SOURCES) \
$(BINDIST_LIBS) \
$(BINDIST_HI) \
$(BINDIST_EXTRAS) \
$(BINDIST_LIBS) \
$(BINDIST_HI) \
$(BINDIST_EXTRAS) \
@@
-931,7
+931,6
@@
$(eval $(call bindist,.,\
$(INSTALL_LIBEXECS) \
$(INSTALL_LIBEXEC_SCRIPTS) \
$(INSTALL_TOPDIRS) \
$(INSTALL_LIBEXECS) \
$(INSTALL_LIBEXEC_SCRIPTS) \
$(INSTALL_TOPDIRS) \
- $(INSTALL_TOPDIR_SCRIPTS) \
$(INSTALL_BINS) \
$(INSTALL_MANPAGES) \
$(INSTALL_DOCS) \
$(INSTALL_BINS) \
$(INSTALL_MANPAGES) \
$(INSTALL_DOCS) \