From eed35d37d325f1a11c621cc6a94b20636cadce5a Mon Sep 17 00:00:00 2001 From: sof <unknown> Date: Mon, 24 Mar 1997 04:27:33 +0000 Subject: [PATCH] [project @ 1997-03-24 04:27:33 by sof] Made WAYS immune --- ghc/utils/mkdependHS/Makefile | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/ghc/utils/mkdependHS/Makefile b/ghc/utils/mkdependHS/Makefile index 8c1cc44ff51c..83b8de1f0a4f 100644 --- a/ghc/utils/mkdependHS/Makefile +++ b/ghc/utils/mkdependHS/Makefile @@ -2,18 +2,16 @@ TOP=../.. include $(TOP)/mk/boilerplate.mk INSTALLING=0 -WAYS= +override WAYS= boot :: all SCRIPT_PROG=mkdependHS SCRIPT_OBJS=mkdependHS.prl SCRIPT_SUBST_VARS= \ - RAWCPP TMPDIR UNLIT_PROG \ + RAWCPP TMPDIR \ TOP_PWD \ - INSTALL_LIB_DIR INSTALL_DATA_DIR \ - INSTALL_HSLIBS_DIR INSTALLING \ - PRELUDE_DIRS \ + INSTALLING \ PROJECTVERSION SED INTERP=perl @@ -21,20 +19,26 @@ INTERP=perl # # install setup # -INSTALL_PROGS += $(SCRIPT_PROG) +INSTALL_SCRIPTS += $(SCRIPT_PROG) + +ifneq "$(BIN_DIST)" "1" +SCRIPT_SUBST_VARS += libdir datadir +endif -INSTALL_HSLIBS_DIR:=$(libdir)/../hslibs-$(ProjectVersion) -INSTALL_LIB_DIR:=$(libdir) -INSTALL_DATA_DIR:=$(datadir) + +# +# Prepend an infomercial if installing (binary-dist or the real thing). +# +ifeq "$(INSTALLING)" "1" +ifeq "$(BIN_DIST)" "1" +SCRIPT_PREFIX_FILES += prefix.txt +endif +endif ifeq "$(INSTALLING)" "1" TOP_PWD:=$(prefix) -UNLIT_PROG:=$(libexecdir)/unlit -PRELUDE_DIRS:=$(libdir)/imports else TOP_PWD:=$(FPTOOLS_TOP_ABS) -UNLIT_PROG:=$(FPTOOLS_TOP_ABS)/ghc/utils/unlit/unlit -PRELUDE_DIRS:="$(FPTOOLS_TOP_ABS)/ghc/lib/ghc:$(FPTOOLS_TOP_ABS)/ghc/lib/required:$(FPTOOLS_TOP_ABS)/ghc/lib/glaExts:$(FPTOOLS_TOP_ABS)/ghc/lib/concurrent" endif # @@ -50,8 +54,10 @@ CLEAN_FILES += $(SCRIPT_PROG) include $(TOP)/mk/target.mk +# # Hack to re-create the in-situ build tree script after -# having just installed it. +# having just installed it (if you don't, confusion ensues +# if you try to use the build tree copy afterwards..) # install :: @$(RM) $(SCRIPT_PROG) -- GitLab