X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Futils%2Fhstags%2FMakefile;h=56ba3b105d5ef711675668b0e7c264fb32865810;hb=5ee134668315a4644b5fc8f5aab1fd6e7e881f15;hp=6350a011b250e0ef8ce736c696213dc9558e9f8d;hpb=b4f5738a15fb0042c2205804c72d395b609503c5;p=ghc-hetmet.git

diff --git a/ghc/utils/hstags/Makefile b/ghc/utils/hstags/Makefile
index 6350a01..56ba3b1 100644
--- a/ghc/utils/hstags/Makefile
+++ b/ghc/utils/hstags/Makefile
@@ -2,12 +2,13 @@ TOP=../..
 include $(TOP)/mk/boilerplate.mk
 
 # No ways
-WAYS=
+override WAYS=
 
 # 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
@@ -19,7 +20,7 @@ SCRIPT_SUBST_VARS=\
  PROJECTVERSION
 
 ifneq "$(BIN_DIST)" "1"
-SCRIPT_SUBST_VARS += INSTLIBDIR_GHC
+SCRIPT_SUBST_VARS += libdir
 endif
 
 #
@@ -31,12 +32,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
@@ -46,12 +44,12 @@ endif
 #
 # what's the deal? I'll add it for now (and perhaps pay for it later :-)
 #  -- SOF
-INTERP=$(PERL)
+INTERP=perl
 
 #
 # install setup
 #
-INSTALL_PROGS=$(SCRIPT_PROG)
+INSTALL_SCRIPTS+=$(SCRIPT_PROG)
 INSTALL_LIBEXECS=$(C_PROG)
 
 #