diff --git a/make/targets-tools.mk b/make/targets-tools.mk
index 2729fedf..7c35f79e 100644
--- a/make/targets-tools.mk
+++ b/make/targets-tools.mk
@@ -3,29 +3,28 @@
 # contact@jannet.de
 # $Id$
 
-all: all.link
-
 include $(MODDIR)/make/rules.mk
 
 ifneq ($(strip $(SRC_ALL_CPP)),)
 
 # mandatory targets
+all: all.link
 install: $(ALL)
 
 # convenience targets
 link: all.link
 clean-link: clean.link
 
-all.link: $(PROJECT)
+all.link: $(HDRDIR_SCOPE_SUFFIX)
 
-$(PROJECT):
+$(HDRDIR_SCOPE_SUFFIX):
 	ln -s . $@
 
 ifeq ($(SCOPE_PREFIX),)
-all.link: $(BUILD_HDRDIR)/$(PROJECT)
+all.link: $(BUILD_HDRDIR)/$(HDRDIR_SCOPE_SUFFIX)
 
-$(BUILD_HDRDIR)/$(PROJECT):
-	cd $(BUILD_HDRDIR) && ln -s . $(PROJECT)
+$(BUILD_HDRDIR)/$(HDRDIR_SCOPE_SUFFIX):
+	cd $(BUILD_HDRDIR_BASE) && ln -s . $(HDRDIR_SCOPE_SUFFIX)
 endif
 
 $(LIB_SO): $(OBJ)
@@ -37,5 +36,5 @@ endif
 clean: objclean textclean localclean profclean clean.link
 
 clean.link:
-	if [ -L $(PROJECT) -a "`readlink $(PROJECT)`" = . ]; then rm $(PROJECT); fi
+	if [ -L $(HDRDIR_SCOPE_SUFFIX) -a "`readlink $(HDRDIR_SCOPE_SUFFIX)`" = . ]; then rm $(HDRDIR_SCOPE_SUFFIX); fi