X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=includes%2FMakefile;h=bebe2eb93fc21bdaaa146606f8cad79226793a1f;hb=9131f4adaf4db771a0a628f9e043693ff90a104b;hp=2acf07531eeff753ca2923bfd11e658d57e37500;hpb=24311993dfecd6225fb3b26c07d2d054fab5387a;p=ghc-hetmet.git

diff --git a/includes/Makefile b/includes/Makefile
index 2acf075..bebe2eb 100644
--- a/includes/Makefile
+++ b/includes/Makefile
@@ -27,10 +27,13 @@ ifeq "$(GhcEnableTablesNextToCode) $(GhcUnregisterised)" "YES NO"
 SRC_CC_OPTS += -DTABLES_NEXT_TO_CODE
 endif
 
+SRC_CC_OPTS += -I. -I../rts
 ifeq "$(HaveLibGmp)" "YES"
-SRC_CC_OPTS += -I. -I../rts -I$(GMP_INCLUDE_DIRS)
+ifneq "$(GMP_INCLUDE_DIRS)" ""
+SRC_CC_OPTS += -I$(GMP_INCLUDE_DIRS)
+endif
 else
-SRC_CC_OPTS += -I. -I../rts -I../gmp/gmpbuild
+SRC_CC_OPTS += -I../gmp/gmpbuild
 endif
 
 ifneq "$(GhcWithSMP)" "YES"
@@ -168,19 +171,16 @@ 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/
+	$(INSTALL_DIR)                     $(BIN_DIST_DIR)/includes
+	$(INSTALL_DATA) Makefile           $(BIN_DIST_DIR)/includes/
+	$(INSTALL_DATA) $(INSTALL_HEADERS) $(BIN_DIST_DIR)/includes/
 
 #
 # `make clean' settings: