diff --git a/make/Makefile b/make/Makefile
index ee50a056..7588ea1d 100644
--- a/make/Makefile
+++ b/make/Makefile
@@ -4,8 +4,6 @@
 # $Id$
 
 MODDIR = ..
+
 include $(MODDIR)/make/ytools.mk
 include $(MODDIR)/make/make.mk
-
-tst:
-	echo $(AC_FILES_IN)
diff --git a/make/defs.mk b/make/defs.mk
index eb83bd99..d421f921 100644
--- a/make/defs.mk
+++ b/make/defs.mk
@@ -103,6 +103,7 @@ INSTALL_BINDIR = $(PREFIX)/bin
 endif
 
 BUILD_BINDIR   = $(TOPDIR)/bin
+LIBDIR      = $(TOPDIR)/lib
 INSTALL_DOCDIR_DIST = $(DOC_PREFIX)
 INSTALL_DOCDIR_DEVEL = $(DOC_PREFIX)-devel
 DOCS = $(wildcard README CHANGES TODO LICENSE AUTHORS CREDITS *.pdf *.txt *.html)
@@ -116,7 +117,9 @@ INSTALLED_DOCS_DEVEL = $(addprefix $(INSTALL_DOCDIR_DEVEL)/,$(DOCS))
 SO_SUFFIX   = so.$(shell echo $(VERSION) | cut -d- -f1)
 LIB_A       = $(LIBDIR)/lib$(LIBNAME).a
 LIB_SO      = $(LIBDIR)/lib$(LIBNAME).$(SO_SUFFIX)
+VERSION_SCRIPT = $(LIBDIR)/version.ldscript
 INSTALLED_LIB_SO = $(INSTALL_LIBDIR)/lib$(LIBNAME).$(SO_SUFFIX)
+INSTALLED_SHOBJS  = $(addprefix $(INSTALL_LIBDIR)/,$(SHOBJS))
 INSTALLED_LINKS_SO = $(shell echo $(INSTALLED_LIB_SO) | sed -e "s/\.so\..*$$/.so/" | grep -v $(INSTALLED_LIB_SO))
 LINKS_SO = $(shell echo $(LIB_SO) | sed -e "s/\.so\..*$$/.so/" | grep -v $(LIB_SO))
 INSTALLED_LIB_A  = $(INSTALL_LIBDIR)/lib$(LIBNAME).a
@@ -141,9 +144,6 @@ LDFFTW    = -lrfftw -lfftw -lm
 #LDAUDIO   = -laudiofile
 CORE       = $(wildcard core core.*)
 
-LIBDIR      = $(TOPDIR)/lib
-INSTALLED_SHOBJS  = $(addprefix $(INSTALL_LIBDIR)/,$(SHOBJS))
-
 ifeq ($(USE_QT),true)
 USE_X = true 
 
diff --git a/make/rules.mk b/make/rules.mk
index aa4628ff..29778e3f 100644
--- a/make/rules.mk
+++ b/make/rules.mk
@@ -54,10 +54,10 @@ lib%.so: %.o
 	$(CC) $(LDFLAGS) $^ -o $@
 endif
 
-version.ldscript:
+$(VERSION_SCRIPT):
 	$(MOD_SCRIPT_DIR)/make_version_script.sh $(BINARY_VERSION) > $@
 
-$(LIB_SO): version.ldscript $(LIB_A)
+$(LIB_SO): $(VERSION_SCRIPT) $(LIB_A)
 	$(CC) -shared -Wl,--whole-archive,-soname=$(notdir $@) $^ -Wl,--no-whole-archive \
 		$(filter-out -l$(LIBNAME),$(LDFLAGS)) -o $@
 
@@ -120,10 +120,12 @@ $(INSTALL_HDRDIR) $(INSTALL_BINDIR) $(INSTALL_LIBDIR) $(INSTALL_MKDIR):
 
 $(INSTALLED_LIB_SO) $(INSTALLED_LIB_A): $(TOPDIR)/libdir.done
 
-$(TOPDIR)/libdir.done: $(INSTALL_LIBDIR)
+$(TOPDIR)/libdir.done:
+	if [ -n "$(INSTALL_LIBDIR)" ]; then mkdir -p $(INSTALL_LIBDIR); fi
 	touch $@
 
-hdrdir.done: $(INSTALL_HDRDIR)
+hdrdir.done:
+	if [ -n "$(INSTALL_HDRDIR)" ]; then mkdir -p $(INSTALL_HDRDIR); fi
 	touch $@
 
 $(LINKS_SO):
@@ -236,7 +238,7 @@ localclean: $(LOCAL_CLEAN)
 	rm -rf $(CLEAN)
 
 libclean:
-	rm -rf $(LIB_A) $(LIB_SO) version.ldscript
+	rm -rf $(LIB_A) $(LIB_SO) $(VERSION_SCRIPT)
 
 vcdistclean:
 	rm -rf *.plg *.opt *.ncb Debug *.exe dist *.ilk