changes to make hashable-1.2.4 combi ok

haskell-implementations · Jan 24, 2016 · 0357a63 · 0357a63
1 parent d65bb52
commit 0357a63
Show file tree

Hide file tree

Showing 17 changed files with 72 additions and 70 deletions.
diff --git a/EHC/Makefile b/EHC/Makefile
@@ -6,7 +6,8 @@
 # Location from which make is invoked
 ###########################################################################################
 
-TOP_PREFIX				:= 
+UHC_TOP_PREFIX			:= 
+TOP_PREFIX				:= $(UHC_TOP_PREFIX)
 
 ###########################################################################################
 # First (default) target just explains what can be done
@@ -48,16 +49,16 @@ $(RULER1): $(RULER1_DIR)/$(RULER1_AG) $(LIB_EH_UTIL_INS_FLAG)
 ### END of Ruler1
 
 include src/files.mk
-include $(SRC_PREFIX)ehc/shared.mk
-include $(MK_PREFIX)functions.mk
-include $(MK_PREFIX)shared.mk
+include $(UHC_SRC_PREFIX)ehc/shared.mk
+include $(UHC_MK_PREFIX)functions.mk
+include $(UHC_MK_PREFIX)shared.mk
 
-#include $(SRC_PREFIX)libutil/files.mk
--include $(SRC_PREFIX)text2text/files.mk
-#include $(SRC_PREFIX)ruler2/files.mk
-include $(SRC_PREFIX)ehc/variant.mk
-include $(SRC_PREFIX)gen/files.mk
-include $(SRC_PREFIX)ehc/files1.mk
+#include $(UHC_SRC_PREFIX)libutil/files.mk
+-include $(UHC_SRC_PREFIX)text2text/files.mk
+#include $(UHC_SRC_PREFIX)ruler2/files.mk
+include $(UHC_SRC_PREFIX)ehc/variant.mk
+include $(UHC_SRC_PREFIX)gen/files.mk
+include $(UHC_SRC_PREFIX)ehc/files1.mk
 
 include extlibs/files.mk
 ifeq ($(EHC_CFG_GMPLIB),gmp)
@@ -68,19 +69,19 @@ include $(EXTLIBS_PREFIX)gmp/files.mk
 endif
 include $(EXTLIBS_PREFIX)ltm/files.mk
 include ehclib/files1.mk
-include $(SRC_PREFIX)rts/files.mk
+include $(UHC_SRC_PREFIX)rts/files.mk
 ifeq ($(ENABLE_JAVA),yes)
--include $(SRC_PREFIX)jazy/files.mk
+-include $(UHC_SRC_PREFIX)jazy/files.mk
 endif
 ifeq ($(ENABLE_JS),yes)
--include $(SRC_PREFIX)javascript/files.mk
+-include $(UHC_SRC_PREFIX)javascript/files.mk
 endif
-include $(SRC_PREFIX)ehc/files2.mk
+include $(UHC_SRC_PREFIX)ehc/files2.mk
 include ehclib/files2.mk
 include test/files.mk
 include test/benchmark/files.mk
 
-#-include $(MK_PREFIX)dist.mk
+#-include $(UHC_MK_PREFIX)dist.mk
 
 ###########################################################################################
 # all versions (as used by testing)
@@ -326,7 +327,7 @@ uhc-dist: uhc
 		config.guess config.sub \
 		$${distdir} && \
 	mkdir -p $${distdir}/mk && \
-	cp $(MK_PREFIX)functions.mk \
+	cp $(UHC_MK_PREFIX)functions.mk \
 		$${distdir}/mk && \
 	cd $${distdir} && \
 	autoconf && \

diff --git a/EHC/configure b/EHC/configure
@@ -3992,7 +3992,7 @@ then
             ghcLibsRequiredWithVersion="${ghcLibsRequiredWithVersion} base>=4.7&&<5"
             ;;
           hashable)
-            ghcLibsRequiredWithVersion="${ghcLibsRequiredWithVersion} hashable>=1.1&&<1.3"
+            ghcLibsRequiredWithVersion="${ghcLibsRequiredWithVersion} hashable>=1.2.4&&<1.3"
             ;;
           fgl)
             # with uhc-util >= 0.1.3.7 no longer necessary

diff --git a/EHC/configure.ac b/EHC/configure.ac
@@ -505,7 +505,7 @@ then
             ghcLibsRequiredWithVersion="${ghcLibsRequiredWithVersion} base>=4.7&&<5"
             ;;
           hashable)
-            ghcLibsRequiredWithVersion="${ghcLibsRequiredWithVersion} hashable>=1.1&&<1.3"
+            ghcLibsRequiredWithVersion="${ghcLibsRequiredWithVersion} hashable>=1.2.4&&<1.3"
             ;;
           fgl)
             # with uhc-util >= 0.1.3.7 no longer necessary

diff --git a/EHC/ehclib/files1.mk b/EHC/ehclib/files1.mk
@@ -12,11 +12,11 @@ EHCLIB_EHCLIB_EHCBASE					:= $(EHCLIB_EHCLIB_PREFIX)$(EHCLIB_EHCBASE)
 EHCLIB_EHCLIB_EHCBASE_PREFIX			:= $(EHCLIB_EHCLIB_EHCBASE)/
 EHCLIB_EHCLIB_EHCBASE_INC				:= $(EHCLIB_EHCLIB_EHCBASE_PREFIX)include
 EHCLIB_EHCLIB_EHCBASE_INC_PREFIX		:= $(EHCLIB_EHCLIB_EHCBASE_INC)/
-EHCLIB_SRC_PREFIX						:= $(TOP_PREFIX)$(EHCLIB_EHCLIB_PREFIX)
+EHCLIB_SRC_PREFIX						:= $(UHC_TOP_PREFIX)$(EHCLIB_EHCLIB_PREFIX)
 EHCLIBABS_SRC_PREFIX					:= $(TOPABS2_PREFIX)$(EHCLIB_EHCLIB_PREFIX)
-EHCLIB_BASE_SRC_PREFIX					:= $(TOP_PREFIX)$(EHCLIB_EHCLIB_EHCBASE_PREFIX)
+EHCLIB_BASE_SRC_PREFIX					:= $(UHC_TOP_PREFIX)$(EHCLIB_EHCLIB_EHCBASE_PREFIX)
 EHCLIBABS_BASE_SRC_PREFIX				:= $(TOPABS2_PREFIX)$(EHCLIB_EHCLIB_EHCBASE_PREFIX)
-EHCLIB_BASE_INC_SRC_PREFIX				:= $(TOP_PREFIX)$(EHCLIB_EHCLIB_EHCBASE_INC_PREFIX)
+EHCLIB_BASE_INC_SRC_PREFIX				:= $(UHC_TOP_PREFIX)$(EHCLIB_EHCLIB_EHCBASE_INC_PREFIX)
 EHCLIBABS_BASE_INC_SRC_PREFIX			:= $(TOPABS2_PREFIX)$(EHCLIB_EHCLIB_EHCBASE_INC_PREFIX)
 
 EHCLIB_EHCUHCBASE						:= uhcbase
@@ -25,9 +25,9 @@ EHCLIB_EHCLIB_EHCUHCBASE				:= $(EHCLIB_EHCLIB_PREFIX)$(EHCLIB_EHCUHCBASE)
 EHCLIB_EHCLIB_EHCUHCBASE_PREFIX			:= $(EHCLIB_EHCLIB_EHCUHCBASE)/
 EHCLIB_EHCLIB_EHCUHCBASE_INC			:= $(EHCLIB_EHCLIB_EHCUHCBASE_PREFIX)include
 EHCLIB_EHCLIB_EHCUHCBASE_INC_PREFIX		:= $(EHCLIB_EHCLIB_EHCUHCBASE_INC)/
-EHCLIB_UHCBASE_SRC_PREFIX				:= $(TOP_PREFIX)$(EHCLIB_EHCLIB_EHCUHCBASE_PREFIX)
+EHCLIB_UHCBASE_SRC_PREFIX				:= $(UHC_TOP_PREFIX)$(EHCLIB_EHCLIB_EHCUHCBASE_PREFIX)
 EHCLIBABS_UHCBASE_SRC_PREFIX			:= $(TOPABS2_PREFIX)$(EHCLIB_EHCLIB_EHCUHCBASE_PREFIX)
-EHCLIB_UHCBASE_INC_SRC_PREFIX			:= $(TOP_PREFIX)$(EHCLIB_EHCLIB_EHCUHCBASE_INC_PREFIX)
+EHCLIB_UHCBASE_INC_SRC_PREFIX			:= $(UHC_TOP_PREFIX)$(EHCLIB_EHCLIB_EHCUHCBASE_INC_PREFIX)
 EHCLIBABS_UHCBASE_INC_SRC_PREFIX		:= $(TOPABS2_PREFIX)$(EHCLIB_EHCLIB_EHCUHCBASE_INC_PREFIX)
 
 # location of GHC sync'ed lib src

diff --git a/EHC/extlibs/bgc/files.mk b/EHC/extlibs/bgc/files.mk
@@ -1,7 +1,7 @@
 # 20110913 NOTE: dependency on this lib has been removed, latest version used was 7.0
 
 # location of Boehm's garbage collector src
-SRC_EXTLIBS_BGC_PREFIX					:= $(TOP_PREFIX)extlibs/bgc/
+SRC_EXTLIBS_BGC_PREFIX					:= $(UHC_TOP_PREFIX)extlibs/bgc/
 SRCABS_EXTLIBS_BGC_PREFIX				:= $(TOPABS2_PREFIX)extlibs/bgc/
 
 # this file

diff --git a/EHC/extlibs/files.mk b/EHC/extlibs/files.mk
@@ -1,2 +1,2 @@
 # location of src
-EXTLIBS_PREFIX	:= $(TOP_PREFIX)extlibs/
+EXTLIBS_PREFIX	:= $(UHC_TOP_PREFIX)extlibs/
diff --git a/EHC/extlibs/gmp/files.mk b/EHC/extlibs/gmp/files.mk
@@ -1,7 +1,7 @@
 # 20110913 NOTE: dependency on this lib has been removed, latest version used was 4.2.1
 
 # location of GMP's src
-SRC_EXTLIBS_GMP_PREFIX					:= $(TOP_PREFIX)extlibs/gmp/
+SRC_EXTLIBS_GMP_PREFIX					:= $(UHC_TOP_PREFIX)extlibs/gmp/
 SRCABS_EXTLIBS_GMP_PREFIX				:= $(TOPABS2_PREFIX)extlibs/gmp/
 
 # this file

diff --git a/EHC/mk/config.mk.in b/EHC/mk/config.mk.in
@@ -2,8 +2,8 @@
 # this file
 ###########################################################################################
 
-MK_PREFIX									:= $(TOP_PREFIX)mk/
-MK_CONFIG_MKF								:= $(MK_PREFIX)config.mk
+UHC_MK_PREFIX								:= $(UHC_TOP_PREFIX)mk/
+MK_CONFIG_MKF								:= $(UHC_MK_PREFIX)config.mk
 
 ###########################################################################################
 # current date

diff --git a/EHC/mk/shared.mk.in b/EHC/mk/shared.mk.in
@@ -2,7 +2,7 @@
 # this file
 ###########################################################################################
 
-MK_SHARED_MKF								:= $(MK_PREFIX)shared.mk
+UHC_MK_SHARED_MKF								:= $(UHC_MK_PREFIX)shared.mk
 
 ###########################################################################################
 # Shared makefile stuff
@@ -164,26 +164,26 @@ EHC_BUILD_SUFFIX_DASH					:= -$(EHC_BUILD_SUFFIX)
 endif
 
 # location for binaries
-BIN_PREFIX			:= $(TOP_PREFIX)bin/
+BIN_PREFIX			:= $(UHC_TOP_PREFIX)bin/
 BINABS_PREFIX		:= $(TOPABS_PREFIX)bin/
 
 # location for haddock
-HDOC_PREFIX			:= $(TOP_PREFIX)hdoc/
+HDOC_PREFIX			:= $(UHC_TOP_PREFIX)hdoc/
 HDOCABS_PREFIX		:= $(TOPABS_PREFIX)hdoc/
 
 # location for libraries
-LIB_PREFIX			:= $(TOP_PREFIX)lib/
+LIB_PREFIX			:= $(UHC_TOP_PREFIX)lib/
 
 # location for cabal installed stuff (mainly libraries), and other build time installs, used when building ehc
-INSTALLFORBLD_PREFIX			:= $(TOP_PREFIX)@INPLACE_INSTALLFORBLD_DIR@$(EHC_BUILD_SUFFIX_DASH)/
+INSTALLFORBLD_PREFIX			:= $(UHC_TOP_PREFIX)@INPLACE_INSTALLFORBLD_DIR@$(EHC_BUILD_SUFFIX_DASH)/
 INSTALLFORBLDABS_PREFIX			:= $(TOPABS_PREFIX)@INPLACE_INSTALLFORBLD_DIR@$(EHC_BUILD_SUFFIX_DASH)/
 INSTALLFORBLDABS2_PREFIX		:= $(TOPABS2_PREFIX)@INPLACE_INSTALLFORBLD_DIR@$(EHC_BUILD_SUFFIX_DASH)/
 INSTALLFORBLDABS_FLAG_PREFIX	:= $(INSTALLFORBLDABS2_PREFIX)ins-flg-
 INSTALLFORBLDABS_LIB_PREFIX		:= $(INSTALLFORBLDABS_PREFIX)lib/
 INSTALLFORBLDABS_INC_PREFIX		:= $(INSTALLFORBLDABS_PREFIX)include/
 
 # location installed stuff, used when running ehc
-INSTALL_DIR						:= $(TOP_PREFIX)@INPLACE_INSTALL_DIR@$(EHC_BUILD_SUFFIX_DASH)
+INSTALL_DIR						:= $(UHC_TOP_PREFIX)@INPLACE_INSTALL_DIR@$(EHC_BUILD_SUFFIX_DASH)
 INSTALLABS_DIR					:= $(TOPABS_PREFIX)@INPLACE_INSTALL_DIR@$(EHC_BUILD_SUFFIX_DASH)
 INSTALLABS2_DIR					:= $(TOPABS2_PREFIX)@INPLACE_INSTALL_DIR@$(EHC_BUILD_SUFFIX_DASH)
 
@@ -202,30 +202,30 @@ INSTALL_UHC_LIB_PREFIX	:= $(INSTALL_UHC_PREFIX)lib/
 INSTALL_UHC_INC_PREFIX	:= $(INSTALL_UHC_PREFIX)include/
 
 # location for distribution construction
-DIST_PREFIX				:= $(TOP_PREFIX)dist$(EHC_BUILD_SUFFIX_DASH)/
+DIST_PREFIX				:= $(UHC_TOP_PREFIX)dist$(EHC_BUILD_SUFFIX_DASH)/
 DISTABS_PREFIX			:= $(TOPABS_PREFIX)dist$(EHC_BUILD_SUFFIX_DASH)/
 
 # location for building
-BLD_PREFIX				:= $(TOP_PREFIX)build$(EHC_BUILD_SUFFIX_DASH)/
+BLD_PREFIX				:= $(UHC_TOP_PREFIX)build$(EHC_BUILD_SUFFIX_DASH)/
 BLDABS_PREFIX			:= $(TOPABS_PREFIX)build$(EHC_BUILD_SUFFIX_DASH)/
 BLD_BIN_PREFIX			:= $(BLD_PREFIX)bin/
 BLD_LIBUTIL_PREFIX		:= $(BLD_PREFIX)libutil/
 
 # location for barebones
-BARE_PREFIX				:= $(TOP_PREFIX)bare$(EHC_BUILD_SUFFIX_DASH)/
+BARE_PREFIX				:= $(UHC_TOP_PREFIX)bare$(EHC_BUILD_SUFFIX_DASH)/
 
 # location for cabal buildable distributions (in particular uhc light)
 CABALDIST_SRC_PREFIX				:= src/
 CABALDIST_SRCMAIN_PREFIX			:= src-main/
-CABALDIST_UHCLIGHT_PREFIX			:= $(TOP_PREFIX)cabaldist$(EHC_BUILD_SUFFIX_DASH)/uhc-light/
+CABALDIST_UHCLIGHT_PREFIX			:= $(UHC_TOP_PREFIX)cabaldist$(EHC_BUILD_SUFFIX_DASH)/uhc-light/
 CABALDIST_UHCLIGHT_SRC_PREFIX		:= $(CABALDIST_UHCLIGHT_PREFIX)$(CABALDIST_SRC_PREFIX)
 CABALDIST_UHCLIGHT_SRCMAIN_PREFIX	:= $(CABALDIST_UHCLIGHT_PREFIX)$(CABALDIST_SRCMAIN_PREFIX)
 
 # location for doc (end products)
-DOC_PREFIX			:= $(TOP_PREFIX)doc/
+DOC_PREFIX			:= $(UHC_TOP_PREFIX)doc/
 
 # location of test src
-TEST_SRC_PREFIX						:= $(TOP_PREFIX)test/
+TEST_SRC_PREFIX						:= $(UHC_TOP_PREFIX)test/
 TEST_REGRESS_SRC_PREFIX				:= $(TEST_SRC_PREFIX)regress/
 
 # location for testing, is done after cd to test src dir, hence these relative paths, must correspond to above dirs w.r.t. nr of dir levels

diff --git a/EHC/src/ehc/Base/Common.chs b/EHC/src/ehc/Base/Common.chs
@@ -90,9 +90,10 @@
 
 %%[99
 deriving instance Generic Version
+%%]
 
+-- with hashable-1.2.4 no longer necessary
 instance Hashable Version
-%%]
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%% Printing of names with non-alpha numeric constants

diff --git a/EHC/src/ehc/files1.mk b/EHC/src/ehc/files1.mk
@@ -28,22 +28,23 @@ EHC_FOR_UHCLIGHT_BLD_EXEC				:= $(call FUN_EHC_INSTALL_VARIANT_ASPECTS_EXEC,$(EH
 # ehcr
 EHC_FOR_UHCRUN_BLD_EXEC					:= $(call FUN_EHCRUN_INSTALL_VARIANT_ASPECTS_EXEC,$(EHC_UHC_INSTALL_VARIANT))
 
-# sources + dpds, for .rul
-EHC_RULES_1_SRC_RUL						:= $(SRC_EHC_PREFIX)rules.rul
-EHC_RULES_2_SRC_RUL						:= $(SRC_EHC_PREFIX)rules2.rul
-EHC_RULES_3_SRC_RL2						:= $(SRC_EHC_RULES_PREFIX)EhcRulesOrig.rul
-
-EHC_RULER_RULES							:= EHRulerRules
-EHC_RULES_3_DRV_CAG						:= $(EHC_BLD_VARIANT_ASPECTS_PREFIX)$(EHC_RULER_RULES).cag
-EHC_RULES_3_DRV_AG						:= $(EHC_RULES_3_DRV_CAG:.cag=.ag)
-
-EHC_RULES_4_MAIN_SRC_RUL				:= $(patsubst %,$(SRC_EHC_RULES_PREFIX)%.rul,EhcRulesExpr2 EhcRulesTyMatch EhcRulesTyElimAlt)
-EHC_RULES_4_DPDS_SRC_RUL				:= $(patsubst %,$(SRC_EHC_RULES_PREFIX)%.rul, \
-													EhcRulesShared EhcRulesShared2 \
-													EhcRulesAST EhcRulesCommon \
-													EhcRulesRelations EhcRulesCommonSchemes EhcRulesSchemes EhcRulesSchemes2 \
-											)
-EHC_RULES_ALL_SRC						:= $(EHC_RULES_1_SRC_RUL) $(EHC_RULES_2_SRC_RUL) $(EHC_RULES_3_SRC_RL2) $(EHC_RULES_4_MAIN_SRC_RUL) $(EHC_RULES_4_DPDS_SRC_RUL)
+## sources + dpds, for .rul
+#EHC_RULES_1_SRC_RUL						:= $(SRC_EHC_PREFIX)rules.rul
+#EHC_RULES_2_SRC_RUL						:= $(SRC_EHC_PREFIX)rules2.rul
+#EHC_RULES_3_SRC_RL2						:= $(SRC_EHC_RULES_PREFIX)EhcRulesOrig.rul
+#
+#EHC_RULER_RULES							:= EHRulerRules
+#EHC_RULES_3_DRV_CAG						:= $(EHC_BLD_VARIANT_ASPECTS_PREFIX)$(EHC_RULER_RULES).cag
+#EHC_RULES_3_DRV_AG						:= $(EHC_RULES_3_DRV_CAG:.cag=.ag)
+#
+#EHC_RULES_4_MAIN_SRC_RUL				:= $(patsubst %,$(SRC_EHC_RULES_PREFIX)%.rul,EhcRulesExpr2 EhcRulesTyMatch EhcRulesTyElimAlt)
+#EHC_RULES_4_DPDS_SRC_RUL				:= $(patsubst %,$(SRC_EHC_RULES_PREFIX)%.rul, \
+#													EhcRulesShared EhcRulesShared2 \
+#													EhcRulesAST EhcRulesCommon \
+#													EhcRulesRelations EhcRulesCommonSchemes EhcRulesSchemes EhcRulesSchemes2 \
+#											)
+#EHC_RULES_ALL_SRC						:= $(EHC_RULES_1_SRC_RUL) $(EHC_RULES_2_SRC_RUL) $(EHC_RULES_3_SRC_RL2) $(EHC_RULES_4_MAIN_SRC_RUL) $(EHC_RULES_4_DPDS_SRC_RUL)
+#
 
 # library
 # derived stuff
@@ -429,9 +430,11 @@ $(EHC_AG_ALL_MAIN_DRV_AG) $(EHC_AG_ALL_DPDS_DRV_AG): $(EHC_BLD_LIB_HS_VARIANT_PR
 	$(SHUFFLE_AG) $(LIB_EHC_SHUFFLE_DEFS) $(SHUFFLE_OPTS_WHEN_EHC) $(EHC_SHUFFLE_OPTS_WHEN_UHC_$(EHC_VARIANT)) --gen-reqm="($(EHC_VARIANT) $(EHC_ASPECTS))" --base=$(*F)  --variant-order="$(EHC_SHUFFLE_ORDER)" $< > $@&& \
 	touch $@
 
-$(EHC_RULES_3_DRV_AG): $(EHC_BLD_VARIANT_ASPECTS_PREFIX)%.ag: $(EHC_BLD_VARIANT_ASPECTS_PREFIX)%.cag $(SHUFFLE)
-	$(SHUFFLE_AG) $(LIB_EHC_SHUFFLE_DEFS) $(SHUFFLE_OPTS_WHEN_EHC) $(EHC_SHUFFLE_OPTS_WHEN_UHC_$(EHC_VARIANT)) --gen-reqm="($(EHC_VARIANT) $(EHC_ASPECTS))" --base=$(*F)  --variant-order="$(EHC_SHUFFLE_ORDER)" $< > $@&& \
-	touch $@
+#ifeq($(EHC_CFG_USE_RULER),yes)
+#$(EHC_RULES_3_DRV_AG): $(EHC_BLD_VARIANT_ASPECTS_PREFIX)%.ag: $(EHC_BLD_VARIANT_ASPECTS_PREFIX)%.cag $(SHUFFLE)
+#	$(SHUFFLE_AG) $(LIB_EHC_SHUFFLE_DEFS) $(SHUFFLE_OPTS_WHEN_EHC) $(EHC_SHUFFLE_OPTS_WHEN_UHC_$(EHC_VARIANT)) --gen-reqm="($(EHC_VARIANT) $(EHC_ASPECTS))" --base=$(*F)  --variant-order="$(EHC_SHUFFLE_ORDER)" $< > $@&& \
+#	touch $@
+#endif
 
 $(EHC_AG_D_MAIN_DRV_HS) $(LIB_EHC_AG_D_MAIN_DRV_HS): %.hs: %.ag
 	$(AGC) -dr $(UUAGC_OPTS_WHEN_EHC) $(UUAGC_OPTS_WHEN_EHC_AST_DATA) $(EHC_UUAGC_OPTS_WHEN_UHC_AST_DATA_$(EHC_VARIANT)) -P$(EHC_BLD_VARIANT_ASPECTS_PREFIX) -P$(EHC_BLD_LIB_HS_VARIANT_PREFIX) $<
@@ -485,7 +488,7 @@ $(EHC_HS_SIG_DRV_HS): \
 	) > $@
 
 # installation configuration
-$(EHC_HS_CFGINSTALL_DRV_HS): $(EHC_MKF) $(MK_SHARED_MKF)
+$(EHC_HS_CFGINSTALL_DRV_HS): $(EHC_MKF) $(UHC_MK_SHARED_MKF)
 	@(echo "-- AUTO GENERATED MODULE - see files1.mk" ; \
 	  echo "module $(LIB_EHC_QUAL_PREFIX)$(EHC_HS_CFGINSTALL_MAIN) where" ; \
 	  echo "import $(LIB_EHC_QUAL_PREFIX)Opts.CommandLine" ; \

diff --git a/EHC/src/ehc/shared.mk b/EHC/src/ehc/shared.mk
@@ -1,5 +1,2 @@
 # location of ehc src (from files.mk, but required globally by mk/shared.mk)
-SRC_EHC_PREFIX							:= $(SRC_PREFIX)ehc/
-SRC_EHC_RULES_PREFIX					:= $(SRC_EHC_PREFIX)rules/
-EHC_SUBDIRS								:= $(patsubst $(SRC_EHC_PREFIX)/%/,%,$(SRC_EHC_RULES_PREFIX))
-LATEX_EHC_SUBDIRS						:= $(patsubst $(SRC_EHC_PREFIX)%,%$(PATHS_SEP_COL),$(EHC_SUBDIRS))
+SRC_EHC_PREFIX							:= $(UHC_SRC_PREFIX)ehc/
diff --git a/EHC/src/files.mk b/EHC/src/files.mk
@@ -1,2 +1,2 @@
 # location of src
-SRC_PREFIX	:= $(TOP_PREFIX)src/
+UHC_SRC_PREFIX	:= $(UHC_TOP_PREFIX)src/
diff --git a/EHC/src/gen/files.mk b/EHC/src/gen/files.mk
@@ -3,7 +3,7 @@
 ###########################################################################################
 
 # this location
-SRC_GEN_PREFIX							:= $(SRC_PREFIX)gen/
+SRC_GEN_PREFIX							:= $(UHC_SRC_PREFIX)gen/
 SRC_GEN_RTSGBCCALL_PREFIX				:= $(SRC_GEN_PREFIX)
 
 # this file

diff --git a/EHC/src/javascript/files.mk b/EHC/src/javascript/files.mk
@@ -2,7 +2,7 @@
 # location of these srcs
 ###########################################################################################
 
-SRC_JSCRIPT_PREFIX					:= $(SRC_PREFIX)javascript/
+SRC_JSCRIPT_PREFIX					:= $(UHC_SRC_PREFIX)javascript/
 
 ###########################################################################################
 # this file

diff --git a/EHC/src/jazy/files.mk b/EHC/src/jazy/files.mk
@@ -2,7 +2,7 @@
 # location of these srcs
 ###########################################################################################
 
-SRC_JAZY_PREFIX				:= $(SRC_PREFIX)jazy/
+SRC_JAZY_PREFIX				:= $(UHC_SRC_PREFIX)jazy/
 
 ###########################################################################################
 # this file

diff --git a/EHC/src/rts/files.mk b/EHC/src/rts/files.mk
@@ -3,7 +3,7 @@
 ###########################################################################################
 
 # Source location
-RTS_SRC_PREFIX := $(SRC_PREFIX)rts/
+RTS_SRC_PREFIX := $(UHC_SRC_PREFIX)rts/
 
 # Build location
 RTS_BLD_PREFIX := $(EHC_BLD_VARIANT_ASPECTS_PREFIX)rts/$(EHC_VARIANT_TARGET)/