X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=includes%2FMakefile;h=a0923c3b5324c2ef958d2c722d65f4d59ca4ac54;hb=74e1368d4688ee16f6decdf2cd3ebe27506b26ba;hp=4b89d52c3913af7d25b0c37925346dc43e5d1500;hpb=094f9feafaf83190891736ddd8d1d7213f4293c4;p=ghc-hetmet.git

diff --git a/includes/Makefile b/includes/Makefile
index 4b89d52..a0923c3 100644
--- a/includes/Makefile
+++ b/includes/Makefile
@@ -12,7 +12,7 @@ H_PLATFORM = ghcplatform.h
 #
 # All header files
 #
-H_FILES = $(filter-out gmp.h $(H_CONFIG) $(H_PLATFORM),$(wildcard *.h)) gmp.h
+H_FILES = $(filter-out $(H_CONFIG) $(H_PLATFORM),$(wildcard *.h))
 
 ifneq "$(DOING_BIN_DIST)" "YES"
 
@@ -27,20 +27,21 @@ ifeq "$(GhcEnableTablesNextToCode) $(GhcUnregisterised)" "YES NO"
 SRC_CC_OPTS += -DTABLES_NEXT_TO_CODE
 endif
 
-SRC_CC_OPTS += -I. -I../rts
+SRC_CC_OPTS += -I. -I../rts -I../rts/parallel
+ifeq "$(HaveLibGmp)" "YES"
+ifneq "$(GMP_INCLUDE_DIRS)" ""
+SRC_CC_OPTS += -I$(GMP_INCLUDE_DIRS)
+endif
+else
+SRC_CC_OPTS += -I../gmp/gmpbuild
+endif
 
 ifneq "$(GhcWithSMP)" "YES"
 SRC_CC_OPTS += -DNOSMP
 endif
 
-boot :: gmp.h
-
 all :: $(H_CONFIG) $(H_PLATFORM)
 
-# gmp.h is copied from the GMP directory
-gmp.h : $(FPTOOLS_TOP)/rts/gmp/gmp.h
-	$(CP) $< $@
-
 # The fptools configure script creates the configuration header file and puts it
 # in fptools/mk/config.h. We copy it down to here (without any PACKAGE_FOO
 # definitions to avoid clashes), prepending some make variables specifying cpp
@@ -170,19 +171,14 @@ endif
 #
 # Install all header files
 #
-# Hackily set the install destination here:
-#
 # Note: we keep per-platform copies of all the include files
 # (ditto for interface files). This is not *really* needed, but
 # it gives (perhaps) a cleaner binary dist structure..might change.
 #
-override datadir:=$(libdir)/include
-INSTALL_DATAS += $(H_FILES) $(H_CONFIG) $(H_PLATFORM)
+INSTALL_HEADERS += $(H_FILES) $(H_CONFIG) $(H_PLATFORM)
 
-binary-dist:
-	$(INSTALL_DIR)                   $(BIN_DIST_DIR)/includes
-	$(INSTALL_DATA) Makefile         $(BIN_DIST_DIR)/includes/
-	$(INSTALL_DATA) $(INSTALL_DATAS) $(BIN_DIST_DIR)/includes/
+BINDIST_EXTRAS += $(INSTALL_HEADERS)
+include $(TOP)/mk/bindist.mk
 
 #
 # `make clean' settings: