Don't use the cc-options from packages when compiling .hc files

[ghc-hetmet.git] / ghc / Makefile

diff --git a/ghc/Makefile b/ghc/Makefile
index 894f2df..3035b43 100644 (file)
--- a/ghc/Makefile
+++ b/ghc/Makefile
@@ -34,16 +34,15 @@ stage2 ::
 stage3 ::
        $(MAKE) stage=3
 
-clean distclean::
-       -$(CABAL) clean --distpref dist-stage1
-       -$(CABAL) clean --distpref dist-stage2
-       -$(CABAL) clean --distpref dist-stage3
-       $(RM) -rf stage1-inplace
-       $(RM) -rf stage2-inplace
-       $(RM) -rf stage3-inplace
+ifeq "$(CLEAN_ALL_STAGES)" "YES"
+clean distclean:: clean.stage.1 clean.stage.2 clean.stage.3
+else
+clean distclean:: clean.stage.$(stage)
+endif
 
-# XXX This should be defined somewhere more central
-INPLACE_DATA_DIR = $(FPTOOLS_TOP_ABS)/inplace-datadir
+clean.stage.%:
+       -$(CABAL) clean --distpref dist-stage$*
+       $(RM) -rf stage$*-inplace
 
 CONFIGURE_FLAGS_STAGE1 += --flags=-ghci
 
@@ -119,16 +118,11 @@ build.stage.%:
 install:
        $(INSTALL_PACKAGE) install UNUSED UNUSED '$(DESTDIR)' '$(prefix)' \
                           '$(prefix)' '$(bindir)' '$(libdir)'            \
-                       '$(libexecdir)' '$(dynlibdir)' '$(libdir)'     \
+                       '$(libexecdir)' '$(dynlibdir)' '$(datadir)'    \
                        '$(docdir)' '$(htmldir)' '$(haddockdir)'       \
                           --distpref dist-stage2                         \
                           $(INSTALL_FLAGS)
 
-# XXX fix:
-#binary-dist:
-#      $(INSTALL_DIR)                      $(BIN_DIST_DIR)/utils/hsc2hs
-#      $(INSTALL_DATA)    Makefile         $(BIN_DIST_DIR)/utils/hsc2hs/
-#      $(INSTALL_DATA)    hsc2hs.sh        $(BIN_DIST_DIR)/utils/hsc2hs/
-#      $(INSTALL_DATA)    $(INSTALL_DATAS) $(BIN_DIST_DIR)/utils/hsc2hs/
-#      $(INSTALL_PROGRAM) $(HS_PROG)       $(BIN_DIST_DIR)/utils/hsc2hs/
+include $(TOP)/mk/bindist.mk
+EXE_DIST_DIR = dist-stage$(stage)