discardTask(): reset task->tso to avoid confusion later

[ghc-hetmet.git] / ghc / utils / hstags / Makefile

diff --git a/ghc/utils/hstags/Makefile b/ghc/utils/hstags/Makefile
index 1e5373e..981bafd 100644 (file)
--- a/ghc/utils/hstags/Makefile
+++ b/ghc/utils/hstags/Makefile
@@ -1,25 +1,23 @@
 TOP=../..
 include $(TOP)/mk/boilerplate.mk
-
-# No ways
-override WAYS=
+include $(TOP)/mk/version.mk
 
 # Note: might be overridden from cmd-line (see install rule below)
 INSTALLING=0
 
 C_PROG=hstags-help
+SRC_CC_OPTS += -O
 
 SCRIPT_PROG=hstags
 SCRIPT_OBJS=hstags.prl
 
 SCRIPT_SUBST_VARS=\
  INSTALLING \
- TMPDIR \
  TOP_PWD \
- PROJECTVERSION
+ ProjectVersionInt
 
 ifneq "$(BIN_DIST)" "1"
-SCRIPT_SUBST_VARS += libdir
+SCRIPT_SUBST_VARS += libdir libexecdir DEFAULT_TMPDIR
 endif
 
 #
@@ -60,8 +58,6 @@ install ::
        @$(RM) $(SCRIPT_PROG)
        @$(MAKE) $(MFLAGS) INSTALLING=1 $(SCRIPT_PROG)
 
-
-CLEAN_FILES += $(SCRIPT_PROG)
 include $(TOP)/mk/target.mk