[project @ 2005-10-26 12:05:03 by simonpj]

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

diff --git a/ghc/utils/hstags/Makefile b/ghc/utils/hstags/Makefile
index f6c1661..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
-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 += INSTLIBDIR_GHC
+SCRIPT_SUBST_VARS += libdir libexecdir DEFAULT_TMPDIR
 endif
 
 #
@@ -31,12 +29,9 @@ ifeq "$(INSTALLING)" "1"
 TOP_PWD := $(prefix)
 ifeq "$(BIN_DIST)" "1"
 SCRIPT_PREFIX_FILES += prefix.txt
-else
-INSTLIBDIR_GHC=$(libdir)
 endif
 else
 TOP_PWD := $(FPTOOLS_TOP_ABS)
-INSTLIBDIR_GHC=$(libdir)
 HSP_IMPORTS:="$(TOP_PWD)/ghc/lib/ghc":"$(TOP_PWD)/ghc/lib/required":"$(TOP_PWD)/ghc/lib/glaExts":"$(TOP_PWD)/ghc/lib/concurrent"
 SCRIPT_SUBST_VARS += HSP_IMPORTS
 endif
@@ -51,7 +46,7 @@ INTERP=perl
 #
 # install setup
 #
-INSTALL_PROGS=$(SCRIPT_PROG)
+INSTALL_SCRIPTS+=$(SCRIPT_PROG)
 INSTALL_LIBEXECS=$(C_PROG)
 
 #
@@ -63,8 +58,6 @@ install ::
        @$(RM) $(SCRIPT_PROG)
        @$(MAKE) $(MFLAGS) INSTALLING=1 $(SCRIPT_PROG)
 
-
-CLEAN_FILES += $(SCRIPT_PROG)
 include $(TOP)/mk/target.mk