diff --git a/make/header.mk b/make/header.mk
index 7970aa79..93eba4ac 100644
--- a/make/header.mk
+++ b/make/header.mk
@@ -4,7 +4,7 @@
 # $Id$
 
 include $(MODDIR)/make/defs.mk
-ALL += $(LIBDIR) $(PREREQ_DONE) $(BUILD_H)
+ALL += $(BUILD_LIBDIR) $(PREREQ_DONE) $(BUILD_HDR)
 include $(MODDIR)/make/rules.mk
 clean: objclean textclean localclean
 install: $(ALL)
diff --git a/make/lo.mk b/make/lo.mk
index deb5d946..fd0f0684 100644
--- a/make/lo.mk
+++ b/make/lo.mk
@@ -21,7 +21,7 @@ LOADABLE_OBJ_LIBS             = $(addprefix $(SO_PREFIX), $(addsuffix .so, $(LOA
 else
 LOADABLE_OBJ_LIBS             = $(addprefix $(SO_PREFIX), $(addsuffix .dll, $(LOADABLE_OBJS)))
 endif
-BUILD_LOADABLE_OBJ_LIBS       = $(addprefix $(LIBDIR)/, $(LOADABLE_OBJ_LIBS))
+BUILD_LOADABLE_OBJ_LIBS       = $(addprefix $(BUILD_LIBDIR)/, $(LOADABLE_OBJ_LIBS))
 INSTALLED_LOADABLE_OBJ_LIBS   = $(addprefix $(INSTALL_LIBDIR)/, $(LOADABLE_OBJ_LIBS))
 
 all: $(LOADABLE_OBJ_LIBS) $(BUILD_LOADABLE_OBJ_LIBS)
@@ -37,7 +37,7 @@ $(SO_PREFIX)%.so $(SO_PREFIX)%.dll: %.o
 %.cpp: $(TOOLS_DIR)/$(CPP_PREFIX)%.h
 	echo -e "#include \"$<\"\n$(LOADABLE_OBJ_HOOK)($(CPP_PREFIX)$*);\n" > $@
 
-$(LIBDIR)/%.so: %.so
+$(BUILD_LIBDIR)/%.so: %.so
 	install -m 755 $< $@
-$(LIBDIR)/%.dll: %.dll
+$(BUILD_LIBDIR)/%.dll: %.dll
 	install -m 755 $< $@
diff --git a/make/plugin-defs.mk b/make/plugin-defs.mk
index 27f17e8b..a7304745 100644
--- a/make/plugin-defs.mk
+++ b/make/plugin-defs.mk
@@ -12,7 +12,7 @@ endif
 PLUGIN                 ?= $(PLUGIN_PREFIX)_$(PLUGIN_API)_$(PLUGIN_NAME).$(PLUGIN_SUFFIX)
 
 PLUGIN_VERSION_LIB_BASENAME = $(PLUGIN_PREFIX)_$(PLUGIN_API)_version
-PLUGIN_VERSION_LIB      = $(LIBDIR)/lib$(PLUGIN_VERSION_LIB_BASENAME).a
+PLUGIN_VERSION_LIB      = $(BUILD_LIBDIR)/lib$(PLUGIN_VERSION_LIB_BASENAME).a
 INSTALLED_PLUGIN_VERSION_LIB = $(INSTALL_LIBDIR)/lib$(PLUGIN_VERSION_LIB_BASENAME).a
 
 CFLAGS                 += -D PLUGIN_NAME_STR=\"$(PLUGIN_NAME)\"
diff --git a/make/so.mk b/make/so.mk
index ea99b8b1..77867d61 100644
--- a/make/so.mk
+++ b/make/so.mk
@@ -4,7 +4,7 @@
 # $Id$
 
 LDFLAGS         += -shared
-BUILD_SHOBJS    = $(addprefix $(LIBDIR)/, $(SHOBJS))
+BUILD_SHOBJS    = $(addprefix $(BUILD_LIBDIR)/, $(SHOBJS))
 
 include $(MODDIR)/make/defs.mk
 include $(MODDIR)/make/ldlibpath.mk
@@ -14,5 +14,5 @@ all: $(SHOBJS) $(BUILD_SHOBJS)
 clean: objclean textclean localclean
 install: $(ALL) installso
 
-$(LIBDIR)/%.so: %.so
+$(BUILD_LIBDIR)/%.so: %.so
 	install -m 755 $< $@