diff --git a/configure/RULES_BUILD b/configure/RULES_BUILD
index a2cb624fd..7a0212e98 100644
--- a/configure/RULES_BUILD
+++ b/configure/RULES_BUILD
@@ -101,10 +101,10 @@ include $(CONFIG)/RULES_FILE_TYPE
 include $(CONFIG)/RULES.Db
 
 #---------------------------------------------------------------
-# Do not build anything if current path matches SKIP_BUILD
+# Do not build anything if current path matches SKIP_BUILDS
 
 ifneq (,$(strip $(SKIP_BUILDS)))
-CURRENT_MODULE=$(subst $(realpath $(TOP)/..)/,,$(subst $(realpath $(dir $(lastword $(MAKEFILE_LIST)))..)/,,$(realpath ..)))
+CURRENT_MODULE=$(subst modules/,,$(subst $(realpath $(TOP)/..)/,,$(subst $(realpath $(dir $(lastword $(MAKEFILE_LIST)))..)/,,$(realpath ..))))
 ifneq ($(filter $(SKIP_BUILDS) $(addsuffix /%,$(SKIP_BUILDS)),$(CURRENT_MODULE)),)
 $(info Skipping $(CURRENT_MODULE) for $(T_A))
 PROD=
@@ -245,7 +245,7 @@ $(TESTPRODNAME) $(PRODNAME): $(PRODUCT_OBJS) $(PROD_RESS) $(PROD_DEPLIBS)
 
 $(TESTPRODNAME) $(PRODNAME): %$(EXE):
 	@$(RM) $@
-	$(DEBUGCMD) $(LINK.cpp)
+	$(LINK.cpp)
 	$(MT_EXE_COMMAND)
 
 %_ctdt$(OBJ): %_ctdt.c
@@ -524,9 +524,11 @@ $(INSTALL_TCLLIB)/%: ../%
 	@$(INSTALL) -d -m $(BIN_PERMISSIONS) $< $(INSTALL_TCLLIB)
 endif
 
+ifneq ($(TCLINDEX),)
 $(INSTALL_TCLLIB)/$(TCLINDEX): $(INSTALL_TCLLIBS)
 	$(ECHO) "Updating $@"
 	$(ECHO) eval auto_mkindex $(INSTALL_TCLLIB) "$(TCLLIBNAME)" | tclsh
+endif
 
 $(INSTALL_LOADABLE_SHRLIBS): $(INSTALL_SHRLIB)/%: %
 	$(ECHO) "Installing loadable shared library $@"