projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add a missing lock around allocGroup()
[ghc-hetmet.git]
/
ghc.mk
diff --git
a/ghc.mk
b/ghc.mk
index
b21aac0
..
706136b
100644
(file)
--- a/
ghc.mk
+++ b/
ghc.mk
@@
-360,9
+360,9
@@
ALL_STAGE1_LIBS += $(foreach lib,$(PACKAGES),$(libraries/$(lib)_dist-install_dyn
endif
BOOT_LIBS = $(foreach lib,$(BOOT_PKGS),$(libraries/$(lib)_dist-boot_v_LIB))
endif
BOOT_LIBS = $(foreach lib,$(BOOT_PKGS),$(libraries/$(lib)_dist-boot_v_LIB))
-OTHER_LIBS = libffi/libHSffi$(v_libsuf) libffi/HSffi.o
+OTHER_LIBS = libffi/dist-install/build/libHSffi$(v_libsuf) libffi/dist-install/build/HSffi.o
ifeq "$(BuildSharedLibs)" "YES"
ifeq "$(BuildSharedLibs)" "YES"
-OTHER_LIBS += libffi/libHSffi$(dyn_libsuf)
+OTHER_LIBS += libffi/dist-install/build/libHSffi$(dyn_libsuf)
endif
# We cannot run ghc-cabal to configure a package until we have
endif
# We cannot run ghc-cabal to configure a package until we have
@@
-492,6
+492,7
@@
endif
BUILD_DIRS += \
docs/users_guide \
BUILD_DIRS += \
docs/users_guide \
+ docs/man \
libraries/Cabal/doc \
$(GHC_UNLIT_DIR) \
$(GHC_HP2PS_DIR)
libraries/Cabal/doc \
$(GHC_UNLIT_DIR) \
$(GHC_HP2PS_DIR)
@@
-716,6
+717,11
@@
install : install_mingw
install_mingw : $(INPLACE_MINGW)
"$(CP)" -Rp $(INPLACE_MINGW) $(prefix)
install_mingw : $(INPLACE_MINGW)
"$(CP)" -Rp $(INPLACE_MINGW) $(prefix)
+install : install_perl
+.PHONY: install_perl
+install_perl : $(INPLACE_PERL)
+ "$(CP)" -Rp $(INPLACE_PERL) $(prefix)
+
endif # Windows
ifneq "$(BINDIST)" "YES"
endif # Windows
ifneq "$(BINDIST)" "YES"
@@
-915,6
+921,7
@@
$(eval $(call bindist,.,\
$(INSTALL_TOPDIRS) \
$(INSTALL_TOPDIR_SCRIPTS) \
$(INSTALL_BINS) \
$(INSTALL_TOPDIRS) \
$(INSTALL_TOPDIR_SCRIPTS) \
$(INSTALL_BINS) \
+ $(INSTALL_MANPAGES) \
$(INSTALL_DOCS) \
$(INSTALL_LIBRARY_DOCS) \
$(addsuffix /*,$(INSTALL_HTML_DOC_DIRS)) \
$(INSTALL_DOCS) \
$(INSTALL_LIBRARY_DOCS) \
$(addsuffix /*,$(INSTALL_HTML_DOC_DIRS)) \
@@
-946,6
+953,7
@@
unix-binary-dist-prep:
echo "BUILD_DOCBOOK_HTML = $(BUILD_DOCBOOK_HTML)" >> $(BIN_DIST_MK)
echo "BUILD_DOCBOOK_PS = $(BUILD_DOCBOOK_PS)" >> $(BIN_DIST_MK)
echo "BUILD_DOCBOOK_PDF = $(BUILD_DOCBOOK_PDF)" >> $(BIN_DIST_MK)
echo "BUILD_DOCBOOK_HTML = $(BUILD_DOCBOOK_HTML)" >> $(BIN_DIST_MK)
echo "BUILD_DOCBOOK_PS = $(BUILD_DOCBOOK_PS)" >> $(BIN_DIST_MK)
echo "BUILD_DOCBOOK_PDF = $(BUILD_DOCBOOK_PDF)" >> $(BIN_DIST_MK)
+ echo "BUILD_MAN = $(BUILD_MAN)" >> $(BIN_DIST_MK)
ln -s ../../distrib/configure-bin.ac $(BIN_DIST_PREP_DIR)/configure.ac
cd $(BIN_DIST_PREP_DIR) && autoreconf
"$(RM)" $(RM_OPTS) $(BIN_DIST_PREP_TAR)
ln -s ../../distrib/configure-bin.ac $(BIN_DIST_PREP_DIR)/configure.ac
cd $(BIN_DIST_PREP_DIR) && autoreconf
"$(RM)" $(RM_OPTS) $(BIN_DIST_PREP_TAR)
@@
-1078,6
+1086,15
@@
SRC_CC_OPTS += -I$(GHC_INCLUDE_DIR)
endif
# -----------------------------------------------------------------------------
endif
# -----------------------------------------------------------------------------
+# sdisting libraries
+
+# Use manually, with e.g.:
+# make sdist_directory
+
+sdist_%:
+ inplace/bin/ghc-cabal sdist libraries/$* dist-install
+
+# -----------------------------------------------------------------------------
# Cleaning
.PHONY: clean
# Cleaning
.PHONY: clean