X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=includes%2FMakefile;h=a0923c3b5324c2ef958d2c722d65f4d59ca4ac54;hb=54e6de853bd5260389006e75d661877ef1ea951d;hp=32ab5f8c49099435cb21267032edd23cd7ad0438;hpb=22010da1a4517529292991ab550bba6d3c3e7523;p=ghc-hetmet.git

diff --git a/includes/Makefile b/includes/Makefile
index 32ab5f8..a0923c3 100644
--- a/includes/Makefile
+++ b/includes/Makefile
@@ -27,7 +27,7 @@ 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)
@@ -171,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: