# This is required because libghccompat.a must be built with
# $(GhcHcOpts) because it is linked to the compiler, and hence
# we must also build with $(GhcHcOpts) here:
-SRC_HC_OPTS += $(GhcHcOpts)
+SRC_HC_OPTS += $(GhcHcOpts) $(GhcStage1HcOpts)
+SRC_HC_OPTS += -Wall
-all :: runhaskell
+RUNHASKELL_PROG = runhaskell$(exeext)
+all :: $(RUNHASKELL_PROG)
-runhaskell : $(HS_PROG)
- $(CP) $< runhaskell$(exeext)
+$(RUNHASKELL_PROG) : $(HS_PROG)
+ $(CP) $< $(RUNHASKELL_PROG)
-CLEAN_FILES += runhaskell
+CLEAN_FILES += $(RUNHASKELL_PROG)
-# Only install runhaskell if there isn't already one installed
-ifneq "$(findstring install, $(MAKECMDGOALS))" ""
-ifeq "$(wildcard $(bindir)/runhaskell)" ""
-INSTALL_PROGS += runhaskell$(exeext)
-endif
+ifneq "$(NO_INSTALL_RUNHASKELL)" "YES"
+INSTALL_PROGS += $(RUNHASKELL_PROG)
endif
+binary-dist::
+ $(INSTALL_DIR) $(BIN_DIST_DIR)/utils/runghc
+ $(INSTALL_DATA) Makefile $(BIN_DIST_DIR)/utils/runghc/
+ $(INSTALL_PROGRAM) $(HS_PROG) $(BIN_DIST_DIR)/utils/runghc/
+ $(INSTALL_PROGRAM) $(RUNHASKELL_PROG) $(BIN_DIST_DIR)/utils/runghc/
+
include $(TOP)/mk/target.mk