diff --git a/XOrg/app/xine-ui/Makefile b/XOrg/app/xine-ui/Makefile
index 6080e9f10..0d6a4ea45 100644
--- a/XOrg/app/xine-ui/Makefile
+++ b/XOrg/app/xine-ui/Makefile
@@ -14,6 +14,7 @@ PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://downloads.sourceforge.net/xine/
+PKG_FIXUP = libtool
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -45,7 +46,6 @@ define Build/Configure
 			$(CONFIGURE_ARGS) ;\
 		fi \
 	)
-	$(call libtool_disable_rpath)
 endef
 
 define Build/Compile
diff --git a/XOrg/app/xmms/Makefile b/XOrg/app/xmms/Makefile
index c63a76994..cf9ee2488 100644
--- a/XOrg/app/xmms/Makefile
+++ b/XOrg/app/xmms/Makefile
@@ -14,6 +14,7 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.xmms.org/files/1.2.x/
 #PKG_INSTALL_MAN:=$(PKG_INSTALL_DIR)/usr/man
+PKG_FIXUP = libtool
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -49,7 +50,6 @@ define Build/Configure
 			$(CONFIGURE_ARGS) ;\
 		fi \
 	)
-	$(call libtool_disable_rpath)
 endef
 
 define Build/Compile
diff --git a/XOrg/lib/libX11/Makefile b/XOrg/lib/libX11/Makefile
index 1bf729355..bfb6a1f70 100644
--- a/XOrg/lib/libX11/Makefile
+++ b/XOrg/lib/libX11/Makefile
@@ -15,6 +15,8 @@ PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/lib/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
 
+PKG_FIXUP = libtool
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libX11
@@ -49,7 +51,6 @@ define Build/Compile
 	make -C $(PKG_BUILD_DIR)
 	mkdir -p $(PKG_INSTALL_DIR)
 	DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
-	$(call libtool_fixup_libdir,$(PKG_INSTALL_DIR))
 endef
 
 define Build/Configure
@@ -63,7 +64,6 @@ define Build/Configure
 		--enable-malloc0returnsnull; \
 	fi \
 	)
-	$(call libtool_disable_rpath)
 endef
 
 define Package/libX11/install/Default
diff --git a/XOrg/lib/libXext/Makefile b/XOrg/lib/libXext/Makefile
index 9a558dfd4..a99e915f0 100644
--- a/XOrg/lib/libXext/Makefile
+++ b/XOrg/lib/libXext/Makefile
@@ -15,6 +15,8 @@ PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/lib/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
 
+PKG_FIXUP = libtool
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libXext
@@ -49,7 +51,6 @@ define Build/Compile
 	make -C $(PKG_BUILD_DIR)
 	mkdir -p $(PKG_INSTALL_DIR)
 	DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
-	$(call libtool_fixup_libdir,$(PKG_INSTALL_DIR))
 endef
 
 define Build/Configure
@@ -63,7 +64,6 @@ define Build/Configure
 		--enable-malloc0returnsnull; \
 	fi \
 	)
-	$(call libtool_disable_rpath)
 endef
 
 define Package/libXext/install/Default
diff --git a/lang/yapsnmp/Makefile b/lang/yapsnmp/Makefile
index 8ba814914..b9404c06f 100644
--- a/lang/yapsnmp/Makefile
+++ b/lang/yapsnmp/Makefile
@@ -17,6 +17,8 @@ PKG_SOURCE_URL:=@SF/$(PKG_NAME)
 PKG_MD5SUM:=8a3e9a5b814388d7907c639105cb2365
 PKG_BUILD_DEPENDS:=python
 
+PKG_FIXUP = libtool
+
 include $(INCLUDE_DIR)/package.mk
 -include $(if $(DUMP),,$(STAGING_DIR)/mk/python-package.mk)
 ifneq ($(MAKECMDGOALS),download)
@@ -53,17 +55,11 @@ CONFIGURE_VARS += \
 	ac_cv_file__usr_include_net_snmp_library="yes" \
 	ac_cv_prog_SWIG="echo MISSING SWIG" \
 
-define Build/Configure
-	$(call Build/Configure/Default)
-	$(call libtool_disable_rpath)
-endef
-
 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		INCLUDES="-I$(PYTHON_INC_DIR)" \
 		SNMPINCDIR="$(STAGING_DIR)/usr/include/net-snmp/library" \
 		all
-	$(call libtool_fixup_libdir,$(PKG_INSTALL_DIR))
 	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install
 endef
 
diff --git a/libs/alsa-lib/Makefile b/libs/alsa-lib/Makefile
index 7c5386b2d..22e695bca 100644
--- a/libs/alsa-lib/Makefile
+++ b/libs/alsa-lib/Makefile
@@ -16,6 +16,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=ftp://ftp.alsa-project.org/pub/lib/
 PKG_MD5SUM:=d55a9d7d2a79d738a1b7a511cffda4b6
 
+PKG_FIXUP = libtool
+
 include $(INCLUDE_DIR)/package.mk
 
 ifeq ($(KERNEL),2.4)
@@ -45,16 +47,10 @@ CONFIGURE_ARGS += \
 	--with-softfloat \
 	--with-versioned=no \
 
-define Build/Configure
-	$(call Build/Configure/Default)
-	$(call libtool_disable_rpath)
-endef
-
 define Build/Compile
 	# override AM_CFLAGS holding inappropriate optimization flags
 	$(MAKE) -C $(PKG_BUILD_DIR) AM_CFLAGS="" all
 	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install
-	$(call libtool_fixup_libdir,$(PKG_INSTALL_DIR))
 endef
 
 define Build/InstallDev
diff --git a/libs/apr-util/Makefile b/libs/apr-util/Makefile
index d734f8458..8a75a8cb7 100644
--- a/libs/apr-util/Makefile
+++ b/libs/apr-util/Makefile
@@ -16,6 +16,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://apache.autinity.de/apr/
 PKG_MD5SUM:=a2e2e54d65e9eae961f7171335cf2550
 
+PKG_FIXUP = libtool
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libaprutil
@@ -39,15 +41,9 @@ CONFIGURE_VARS += \
 	ac_cv_file_dbd_apr_dbd_mysql_c=no \
 	APR_BUILD_DIR="$(STAGING_DIR)/usr/share/build-1" \
 
-define Build/Configure
-	$(call Build/Configure/Default)
-	$(call libtool_disable_rpath)
-endef
-
 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) APRUTIL_LIBS="-lsqlite3 -L$(STAGING_DIR)/usr/lib -lexpat -liconv -lapr-1 -luuid -lm -lcrypt" all
 	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install
-	$(call libtool_fixup_libdir,$(PKG_INSTALL_DIR))
 endef
 
 define Build/InstallDev
diff --git a/libs/apr/Makefile b/libs/apr/Makefile
index 09700e935..048711848 100644
--- a/libs/apr/Makefile
+++ b/libs/apr/Makefile
@@ -16,6 +16,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://apache.d-s-s-p.de/apr/
 PKG_MD5SUM:=6f4b063ac01a54ba0818c31280f06959
 
+PKG_FIXUP = libtool
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libapr
@@ -39,15 +41,8 @@ CONFIGURE_VARS += \
 	ac_cv_sizeof_ssize_t=4 \
 	LDFLAGS="$$$$LDFLAGS -lpthread" \
 
-define Build/Configure
-	$(call Build/Configure/Default)
-	$(call libtool_disable_rpath)
-endef
-
 define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) all
-	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install
-	$(call libtool_fixup_libdir,$(PKG_INSTALL_DIR))
+	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" all install
 endef
 
 define Build/InstallDev
diff --git a/libs/curl/Makefile b/libs/curl/Makefile
index 987e52406..061b4140c 100644
--- a/libs/curl/Makefile
+++ b/libs/curl/Makefile
@@ -22,6 +22,8 @@ PKG_SOURCE_URL:=http://curl.haxx.se/download/ \
 	http://curl.mirrors.cyberservers.net/download/
 PKG_MD5SUM:=46ce665e47d37fce1a0bad935cce58a9
 
+PKG_FIXUP = libtool
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/curl/Default
@@ -72,14 +74,7 @@ CONFIGURE_ARGS += \
 	--with-zlib="$(STAGING_DIR)/usr" \
 	--disable-gssapi
 
-define Build/Configure
-	$(call Build/Configure/Default)
-	$(call libtool_disable_rpath)
-endef
-
 define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) all
-	$(call libtool_fixup_libdir,$(PKG_INSTALL_DIR))
 	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install
 endef
 
diff --git a/libs/expat/Makefile b/libs/expat/Makefile
index ab646cb3d..a377ab8ed 100644
--- a/libs/expat/Makefile
+++ b/libs/expat/Makefile
@@ -16,6 +16,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_MD5SUM:=aff487543845a82fe262e6e2922b4c8e
 PKG_SOURCE_URL:=@SF/expat
 
+PKG_FIXUP = libtool
+
 include $(INCLUDE_DIR)/package.mk
 
 
@@ -31,19 +33,11 @@ define Package/libexpat/description
 endef
 
 
-PKG_CONFIGURE_ARGS += \
+CONFIGURE_ARGS += \
 	--enable-shared \
-	--enable-static \
-
-
-define Build/Configure
-	$(call Build/Configure/Default)
-	$(call libtool_disable_rpath)
-endef
+	--enable-static
 
 define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) all
-	$(call libtool_fixup_libdir,$(PKG_INSTALL_DIR))
 	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install
 endef
 
diff --git a/libs/fcgi/Makefile b/libs/fcgi/Makefile
index 81037073b..8f5a7816d 100644
--- a/libs/fcgi/Makefile
+++ b/libs/fcgi/Makefile
@@ -16,6 +16,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.fastcgi.com/dist/
 PKG_MD5SUM:=d15060a813b91383a9f3c66faf84867e
 
+PKG_FIXUP = libtool
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/fcgi
@@ -40,15 +42,7 @@ CONFIGURE_VARS += \
 	CXXFLAGS="$$$$CXXFLAGS -fno-builtin -fno-rtti -nostdinc++"  \
 	LIBS="-nodefaultlibs -luClibc++ -lm" \
 
-
-define Build/Configure
-	$(call Build/Configure/Default)
-	$(call libtool_disable_rpath)
-endef
-
 define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) all
-	$(call libtool_fixup_libdir,$(PKG_INSTALL_DIR))
 	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" all install
 endef
 
diff --git a/libs/freetype/Makefile b/libs/freetype/Makefile
index c9f0339c6..4dc5b4981 100644
--- a/libs/freetype/Makefile
+++ b/libs/freetype/Makefile
@@ -16,6 +16,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/freetype
 PKG_MD5SUM:=11e1186ca5520c5a284fa0a03f652035
 
+PKG_FIXUP = libtool
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libfreetype
@@ -37,15 +39,8 @@ CONFIGURE_ARGS += \
 	--enable-shared \
 	--enable-static \
 
-define Build/Configure
-	$(call Build/Configure/Default)
-	$(call libtool_disable_rpath)
-endef
-
 define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) all
-	$(call libtool_fixup_libdir,$(PKG_INSTALL_DIR))
-	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install
+	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" all install
 endef
 
 define Build/InstallDev
diff --git a/libs/gdbm/Makefile b/libs/gdbm/Makefile
index 84983cd5e..f86743bc1 100644
--- a/libs/gdbm/Makefile
+++ b/libs/gdbm/Makefile
@@ -16,6 +16,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/gdbm
 PKG_MD5SUM:=1d1b1d5c0245b1c00aff92da751e9aa1
 
+PKG_FIXUP = libtool
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libgdbm
@@ -29,19 +31,12 @@ CONFIGURE_ARGS += \
 	--enable-shared \
 	--enable-static \
 
-define Build/Configure
-	$(call Build/Configure/Default)
-	$(call libtool_disable_rpath)
-endef
-
 define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) all
-	$(call libtool_fixup_libdir,$(PKG_INSTALL_DIR))
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		BINOWN=`id -u` \
 		BINGRP=`id -g` \
 		INSTALL_ROOT="$(PKG_INSTALL_DIR)" \
-		install
+		all install
 endef
 
 define Build/InstallDev
diff --git a/libs/gettext/Makefile b/libs/gettext/Makefile
index a3c9479b4..0b148933b 100644
--- a/libs/gettext/Makefile
+++ b/libs/gettext/Makefile
@@ -16,6 +16,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/gettext
 PKG_MD5SUM:=3d9ad24301c6d6b17ec30704a13fe127
 
+PKG_FIXUP = libtool
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libintl
@@ -38,15 +40,8 @@ CONFIGURE_ARGS += \
 	--without-libexpat-prefix \
 	--without-emacs
 
-define Build/Configure
-	$(call Build/Configure/Default)
-	$(call libtool_disable_rpath)
-endef
-
 define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) all
-	$(call libtool_fixup_libdir,$(PKG_INSTALL_DIR))
-	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install
+	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" all install
 endef
 
 define Build/InstallDev	
diff --git a/libs/glib/Makefile b/libs/glib/Makefile
index 16885ab0e..6abd85edb 100644
--- a/libs/glib/Makefile
+++ b/libs/glib/Makefile
@@ -19,6 +19,8 @@ PKG_SOURCE_URL:=ftp://ftp.gtk.org/pub/gtk/v1.2 \
 	http://www.mirrorservice.org/sites/ftp.gimp.org/pub/gtk/v1.2/
 PKG_MD5SUM:=6fe30dad87c77b91b632def29dd69ef9
 
+PKG_FIXUP = libtool
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/glib1
@@ -54,15 +56,8 @@ CONFIGURE_VARS += \
 	glib_cv_sizeof_gmutex=24 \
 	glib_cv_byte_contents_gmutex="0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0" \
 
-define Build/Configure
-	$(call Build/Configure/Default)
-	$(call libtool_disable_rpath)
-endef
-
 define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) all
-	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install
-	$(call libtool_fixup_libdir,$(PKG_INSTALL_DIR))
+	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" all install
 endef
 
 define Build/InstallDev
diff --git a/libs/glib2/Makefile b/libs/glib2/Makefile
index 3ba88d696..b3c33bf2d 100644
--- a/libs/glib2/Makefile
+++ b/libs/glib2/Makefile
@@ -18,6 +18,8 @@ PKG_MD5SUM:=6c6a61e4b08fb4b110ca7953f71c8b5e
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/glib-$(PKG_VERSION)
 
+PKG_FIXUP = libtool
+
 include $(INCLUDE_DIR)/package.mk
 
 
@@ -35,9 +37,6 @@ endef
 
 
 define Build/Configure
-endef
-
-define Build/Compile
 	mkdir -p $(PKG_BUILD_DIR)/build/$(GNU_HOST_NAME)
 	( cd $(PKG_BUILD_DIR); CONFIG_SITE= \
 		./configure \
@@ -64,10 +63,10 @@ define Build/Compile
 		glib_cv_uscore=no \
 		ac_cv_path_GLIB_GENMARSHAL=$(PKG_BUILD_DIR)/build/$(GNU_HOST_NAME)/bin/glib-genmarshal \
 	);
-	$(call libtool_disable_rpath)
-	$(MAKE) -C $(PKG_BUILD_DIR) all
-	$(call libtool_fixup_libdir,$(PKG_INSTALL_DIR))
-	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install
+endef
+
+define Build/Compile
+	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" all install
 endef
 
 define Build/InstallDev
diff --git a/libs/gnutls/Makefile b/libs/gnutls/Makefile
index 0419e192f..79e389b45 100644
--- a/libs/gnutls/Makefile
+++ b/libs/gnutls/Makefile
@@ -20,6 +20,8 @@ PKG_SOURCE_URL:=http://josefsson.org/gnutls/releases/ \
 	ftp://ftp.mirrors.wiretapped.net/pub/security/network-security/gnutls/
 PKG_MD5SUM:=181b2ff554a83e6cf85505ea16699d39
 
+PKG_FIXUP = libtool
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/gnutls/Default
@@ -140,13 +142,10 @@ define Build/Configure
 	$(SED) 's,-I$$$${includedir},,g' $(PKG_BUILD_DIR)/configure
 	$(SED) 's,-L$$$${libdir},,g' $(PKG_BUILD_DIR)/configure
 	$(call Build/Configure/Default)
-	$(call libtool_disable_rpath)
 endef
 
 define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_ARGS) all
-	$(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_ARGS) DESTDIR="$(PKG_INSTALL_DIR)" install
-	$(call libtool_fixup_libdir,$(PKG_INSTALL_DIR))
+	$(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_ARGS) DESTDIR="$(PKG_INSTALL_DIR)" all install
 endef
 
 define Build/InstallDev
diff --git a/libs/id3lib/Makefile b/libs/id3lib/Makefile
index e21323134..a099bd89e 100644
--- a/libs/id3lib/Makefile
+++ b/libs/id3lib/Makefile
@@ -16,6 +16,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/id3lib
 PKG_MD5SUM:=19f27ddd2dda4b2d26a559a4f0f402a7
 
+PKG_FIXUP = libtool
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/id3lib
@@ -34,15 +36,8 @@ CONFIGURE_VARS += \
 	CXXFLAGS="$$$$CXXFLAGS -fno-builtin -fno-rtti"  \
 	LIBS="-nodefaultlibs -lz -luClibc++ -Wl,-Bstatic,-lstdc++,-Bdynamic -lm" \
 
-define Build/Configure
-	$(call Build/Configure/Default)
-	$(call libtool_disable_rpath)
-endef
-
 define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) all
-	$(call libtool_fixup_libdir,$(PKG_INSTALL_DIR))
-	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install
+	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" all install
 endef
 
 define Build/InstallDev
diff --git a/libs/iksemel/Makefile b/libs/iksemel/Makefile
index a7cf8439c..68ed0f360 100644
--- a/libs/iksemel/Makefile
+++ b/libs/iksemel/Makefile
@@ -16,6 +16,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://iksemel.googlecode.com/files/
 PKG_MD5SUM:=36ab2d9f11980a19217b6f79a19ef8e7
 
+PKG_FIXUP = libtool
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libiksemel
@@ -34,15 +36,8 @@ CONFIGURE_ARGS += \
 CONFIGURE_VARS += \
 	LIBS="-lgnutls -lgcrypt -lgpg-error" \
 
-define Build/Configure
-	$(call Build/Configure/Default)
-	$(call libtool_disable_rpath)
-endef
-
 define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) all
-	$(call libtool_fixup_libdir,$(PKG_INSTALL_DIR))
-	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install
+	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" all install
 endef
 
 define Build/InstallDev
diff --git a/libs/jpeg/Makefile b/libs/jpeg/Makefile
index ff0e9346d..a0b1d8f65 100644
--- a/libs/jpeg/Makefile
+++ b/libs/jpeg/Makefile
@@ -20,7 +20,7 @@ PKG_MD5SUM:=dbd5f3b47ed13132f04c685d608a7547
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
-PKG_BUILD_DEPENDS:=libtool
+PKG_FIXUP = libtool
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -58,10 +58,6 @@ define Build/Prepare
 	ln -sf /bin/true $(PKG_BUILD_DIR)/ltconfig
 endef
 
-define Build/Configure
-	$(call Build/Configure/Default,)
-endef
-
 define Build/Compile
 	rm -rf $(PKG_INSTALL_DIR)
 	mkdir -p $(PKG_INSTALL_DIR)/usr/{include,lib,bin,man/man1}
diff --git a/libs/libiconv/Makefile b/libs/libiconv/Makefile
index fde3a74b9..e0b9b57af 100644
--- a/libs/libiconv/Makefile
+++ b/libs/libiconv/Makefile
@@ -16,6 +16,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/libiconv
 PKG_MD5SUM:=0c99a05e0c3c153bac1c960f78711155
 
+PKG_FIXUP = libtool
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libiconv
@@ -32,12 +34,10 @@ CONFIGURE_ARGS += \
 
 define Build/Configure
 	$(call Build/Configure/Default)
-	$(call libtool_disable_rpath)
 endef
 
 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) CC="$(TARGET_CC)"
-	$(call libtool_fixup_libdir,$(PKG_INSTALL_DIR))
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		includedir="$(PKG_INSTALL_DIR)/usr/include" \
 		libdir="$(PKG_INSTALL_DIR)/usr/lib" \
diff --git a/libs/liboil/Makefile b/libs/liboil/Makefile
index 0ad63aa0c..b8f65c10d 100644
--- a/libs/liboil/Makefile
+++ b/libs/liboil/Makefile
@@ -16,6 +16,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://liboil.freedesktop.org/download/
 PKG_MD5SUM:=96ee4c627ffb0db3999cef3c7454b1d9
 
+PKG_FIXUP = libtool
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/liboil
@@ -47,15 +49,8 @@ CONFIGURE_VARS += \
 	LIBS="-lnotimpl" \
 	ac_cv_lib_m_rintf=no \
 
-define Build/Configure
-	$(call Build/Configure/Default)
-	$(call libtool_disable_rpath)
-endef
-
 define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) all
-	$(call libtool_fixup_libdir,$(PKG_INSTALL_DIR))
-	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install
+	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" all install
 endef
 
 define Build/InstallDev
diff --git a/libs/libosip2/Makefile b/libs/libosip2/Makefile
index 681af3ba9..b57c283fd 100644
--- a/libs/libosip2/Makefile
+++ b/libs/libosip2/Makefile
@@ -16,6 +16,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/osip
 PKG_MD5SUM:=f1237af0250c59b318bd64a59f5750ea
 
+PKG_FIXUP = libtool
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libosip2
@@ -41,7 +43,6 @@ CONFIGURE_ARGS+= \
 
 define Build/Configure
 	$(call Build/Configure/Default)
-	$(call libtool_disable_rpath)
 endef
 
 define Build/Compile
diff --git a/libs/libsamplerate/Makefile b/libs/libsamplerate/Makefile
index c587fe104..dd3cb36d9 100644
--- a/libs/libsamplerate/Makefile
+++ b/libs/libsamplerate/Makefile
@@ -19,6 +19,8 @@ PKG_MD5SUM:=6861c2c6b8e5273c9b80cf736b9fd0e
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
+PKG_FIXUP = libtool
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libsamplerate
@@ -37,7 +39,6 @@ define Build/Configure
 	$(call Build/Configure/Default, \
 		--disable-fftw \
 	)
-	$(call libtool_disable_rpath)
 endef
 
 define Build/Compile
diff --git a/libs/libsigc++/Makefile b/libs/libsigc++/Makefile
index 72a654870..a3104b8ee 100644
--- a/libs/libsigc++/Makefile
+++ b/libs/libsigc++/Makefile
@@ -18,6 +18,8 @@ PKG_MD5SUM:=fde0ee69e3125e982746d9fe005763e1
 
 PKG_BUILD_DEPENDS:=libtool
 
+PKG_FIXUP = libtool
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libsigcxx
@@ -45,7 +47,6 @@ CONFIGURE_VARS += \
 
 define Build/Configure
 	$(call Build/Configure/Default,)
-	$(call libtool_disable_rpath)
 	$(SED) 's|^sys_lib_dlsearch_path_spec=.*|sys_lib_dlsearch_path_spec="$(STAGING_DIR)/usr/lib"|g' \
 		$(PKG_BUILD_DIR)/libtool
 	$(SED) 's|^postdeps=.*|postdeps=|g' $(PKG_BUILD_DIR)/libtool
@@ -53,7 +54,6 @@ endef
 
 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) all
-	$(call libtool_fixup_libdir,$(PKG_INSTALL_DIR))
 	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install
 endef
 
diff --git a/libs/libsndfile/Makefile b/libs/libsndfile/Makefile
index fbe7a5d16..976a3f00b 100644
--- a/libs/libsndfile/Makefile
+++ b/libs/libsndfile/Makefile
@@ -19,6 +19,8 @@ PKG_MD5SUM:=2d126c35448503f6dbe33934d9581f6b
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
+PKG_FIXUP = libtool
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libsndfile
@@ -37,18 +39,8 @@ CONFIGURE_ARGS += \
 	--disable-flac
 
 MAKE_FLAGS += \
-	DESTDIR="$(PKG_INSTALL_DIR)"
-
-define Build/Configure
-	$(call Build/Configure/Default)
-	$(call libtool_disable_rpath)
-endef
-
-define Build/Compile
-	$(call Build/Compile/Default,all)
-	$(call libtool_fixup_libdir,$(PKG_INSTALL_DIR))
-	$(call Build/Compile/Default,install)
-endef
+	DESTDIR="$(PKG_INSTALL_DIR)" \
+	all install
 
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)
diff --git a/libs/libtasn1/Makefile b/libs/libtasn1/Makefile
index 0b32fe08a..054c7463f 100644
--- a/libs/libtasn1/Makefile
+++ b/libs/libtasn1/Makefile
@@ -20,6 +20,8 @@ PKG_SOURCE_URL:=ftp://ftp.gnutls.org/pub/gnutls/libtasn1/ \
 	http://josefsson.org/gnutls/releases/libtasn1/
 PKG_MD5SUM:=93b43cc5013bda4d8bf64508f1566c54
 
+PKG_FIXUP = libtool
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libtasn1
@@ -34,17 +36,11 @@ define Package/libtasn1/description
  Distinguish Encoding Rules (DER) manipulation.
 endef
 
-define Build/Configure
-	$(call Build/Configure/Default, \
+CONFIGURE_ARGS += \
 		--enable-shared \
-		--enable-static \
-	)
-	$(call libtool_disable_rpath)
-endef
+		--enable-static
 
 define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) all
-	$(call libtool_fixup_libdir,$(PKG_INSTALL_DIR))
 	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" all install
 endef
 
diff --git a/libs/libtorrent/Makefile b/libs/libtorrent/Makefile
index 5d1ea6903..6ace2b21a 100644
--- a/libs/libtorrent/Makefile
+++ b/libs/libtorrent/Makefile
@@ -18,6 +18,8 @@ PKG_MD5SUM:=86cdfca2d1c3cfb3b6b316d9beaa25e0
 
 PKG_BUILD_DEPENDS:=libtool
 
+PKG_FIXUP = libtool
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libtorrent
@@ -49,7 +51,6 @@ CONFIGURE_VARS += \
 
 define Build/Configure
 	$(call Build/Configure/Default,)
-	$(call libtool_disable_rpath)
 	$(SED) 's|^sys_lib_dlsearch_path_spec=.*|sys_lib_dlsearch_path_spec="$(STAGING_DIR)/usr/lib"|g' \
 		$(PKG_BUILD_DIR)/libtool
 	$(SED) 's|^postdeps=.*|postdeps=|g' $(PKG_BUILD_DIR)/libtool
diff --git a/libs/libxml2/Makefile b/libs/libxml2/Makefile
index 4c93e77a9..37cae8285 100644
--- a/libs/libxml2/Makefile
+++ b/libs/libxml2/Makefile
@@ -20,6 +20,8 @@ PKG_MD5SUM:=8f0b3ce721bda11401e656b90ba4e78c
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
+PKG_FIXUP = libtool
+
 include $(INCLUDE_DIR)/package.mk
 
 
@@ -68,15 +70,8 @@ CONFIGURE_ARGS += \
 	--with-zlib \
 
 
-define Build/Configure
-	$(call Build/Configure/Default)
-	$(call libtool_disable_rpath)
-endef
-
 define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) all
-	$(call libtool_fixup_libdir,$(PKG_INSTALL_DIR))
-	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install
+	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" all install
 endef
 
 define Build/InstallDev
diff --git a/libs/neon/Makefile b/libs/neon/Makefile
index 03dba0a30..6932b1d8e 100644
--- a/libs/neon/Makefile
+++ b/libs/neon/Makefile
@@ -16,6 +16,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.webdav.org/neon/
 PKG_MD5SUM:=6e52cd9c03e372026d6eccbfb80f09ef
 
+PKG_FIXUP = libtool
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libneon
@@ -38,15 +40,8 @@ CONFIGURE_ARGS += \
 CONFIGURE_VARS += \
 	LDFLAGS="$$$$LDFLAGS -lcrypto -lssl"
 
-define Build/Configure
-	$(call Build/Configure/Default)
-	$(call libtool_disable_rpath)
-endef
-
 define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) all
-	$(call libtool_fixup_libdir,$(PKG_INSTALL_DIR))
-	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install
+	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" all install
 endef
 
 define Build/InstallDev
diff --git a/net/asterisk-addons-1.4.x/Makefile b/net/asterisk-addons-1.4.x/Makefile
index 6df3532f8..205a1978f 100644
--- a/net/asterisk-addons-1.4.x/Makefile
+++ b/net/asterisk-addons-1.4.x/Makefile
@@ -16,6 +16,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://ftp.digium.com/pub/asterisk/old-releases/
 PKG_MD5SUM:=c080b02e6ddc81dab6a64691af890805
 
+PKG_FIXUP = libtool
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/asterisk-addons/Default
@@ -100,7 +102,6 @@ define Build/Configure
 	( cd $(PKG_BUILD_DIR); ./bootstrap.sh )
 	$(call Build/Configure/Default,,,)
 	$(call Build/Configure/Default,,,asterisk-ooh323c)
-	$(call libtool_disable_rpath)
 endef
 
 # XXX: explanations
@@ -123,7 +124,6 @@ define Build/Compile
 	$(MAKE) -C "$(PKG_BUILD_DIR)" \
 		$(MAKE_ARGS) \
 		all
-	$(call libtool_fixup_libdir,$(PKG_INSTALL_DIR))
 	$(MAKE_VARS) \
 	$(MAKE) -C "$(PKG_BUILD_DIR)" \
 		$(MAKE_ARGS) \
diff --git a/net/ctorrent/Makefile b/net/ctorrent/Makefile
index ea85c71bf..8f5676732 100644
--- a/net/ctorrent/Makefile
+++ b/net/ctorrent/Makefile
@@ -16,6 +16,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.rahul.net/dholmes/ctorrent/
 PKG_MD5SUM:=23b37cd7b558ad6a27974b311499bab6
 
+PKG_FIXUP = libtool
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/ctorrent
@@ -37,15 +39,8 @@ CONFIGURE_VARS += \
 	CXX="g++-uc" \
 	CXXFLAGS="$$$$CXXFLAGS -fno-rtti" \
 
-define Build/Configure
-	$(call Build/Configure/Default,)
-	$(call libtool_disable_rpath)
-endef
-
 define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) all
-	$(call libtool_fixup_libdir,$(PKG_INSTALL_DIR))
-	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install
+	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" all install
 endef
 
 define Package/ctorrent/install	
diff --git a/net/lighttpd/Makefile b/net/lighttpd/Makefile
index 113b57d42..66ea2db2b 100644
--- a/net/lighttpd/Makefile
+++ b/net/lighttpd/Makefile
@@ -16,6 +16,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.lighttpd.net/download/
 PKG_MD5SUM:=26f98dddf9d8c0775221b800986003ee
 
+PKG_FIXUP = libtool
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/lighttpd/Default
@@ -152,15 +154,8 @@ CONFIGURE_VARS+= \
 	CPPFLAGS="-I$(STAGING_DIR)/usr/include/libxml2 $$$$CPPFLAGS" \
 	PCRE_LIB="-lpcre" \
 
-define Build/Configure
-	$(call Build/Configure/Default,)
-	$(call libtool_disable_rpath)
-endef
-
 define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) all
-	$(call libtool_fixup_libdir,$(PKG_INSTALL_DIR))
-	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install
+	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" all install
 endef
 
 define Package/lighttpd/conffiles
diff --git a/net/mutella/Makefile b/net/mutella/Makefile
index 76e5b3376..a8b4813a6 100644
--- a/net/mutella/Makefile
+++ b/net/mutella/Makefile
@@ -16,6 +16,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/$(PKG_NAME)
 PKG_MD5SUM:=1a676eacf562e3b8de90493f99fe059c
 
+PKG_FIXUP = libtool
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/mutella
@@ -48,15 +50,8 @@ define Build/Prepare
 	$(SED) 's,-L$$$$(libdir),,g' $(PKG_BUILD_DIR)/{mutella,util}/Makefile.in
 endef
 
-define Build/Configure
-	$(call Build/Configure/Default)
-	$(call libtool_disable_rpath)
-endef
-
 define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) all
-	$(call libtool_fixup_libdir,$(PKG_INSTALL_DIR))
-	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install
+	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" all install
 endef
 
 define Package/mutella/install
diff --git a/net/rtorrent/Makefile b/net/rtorrent/Makefile
index 50c6e9729..7d9a03dd4 100644
--- a/net/rtorrent/Makefile
+++ b/net/rtorrent/Makefile
@@ -16,7 +16,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://libtorrent.rakshasa.no/downloads/
 PKG_MD5SUM:=430ac264605fc13be6a5d15180e5c957
 
-PKG_BUILD_DEPENDS:=libtool
+PKG_FIXUP = libtool
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -46,18 +46,8 @@ CONFIGURE_VARS += \
 	CXXFLAGS="$$$$CXXFLAGS -fno-rtti"  \
 	LIBS="-lm" \
 
-define Build/Configure
-	$(call Build/Configure/Default,)
-	$(call libtool_disable_rpath)
-	$(SED) 's|^sys_lib_dlsearch_path_spec=.*|sys_lib_dlsearch_path_spec="$(STAGING_DIR)/usr/lib"|g' \
-		$(PKG_BUILD_DIR)/libtool
-	$(SED) 's|^postdeps=.*|postdeps=|g' $(PKG_BUILD_DIR)/libtool
-endef
-
 define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) all
-	$(call libtool_fixup_libdir,$(PKG_INSTALL_DIR))
-	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install
+	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" all install
 endef
 
 define Package/rtorrent/install	
diff --git a/net/softflowd/Makefile b/net/softflowd/Makefile
index 007078364..304d53776 100644
--- a/net/softflowd/Makefile
+++ b/net/softflowd/Makefile
@@ -16,6 +16,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.mindrot.org/files/softflowd/
 PKG_MD5SUM:=0054d1c80494396cc15edb0a1c7748b1
 
+PKG_FIXUP = libtool
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/softflowd
@@ -30,13 +32,7 @@ define Package/softflowd/description
 	Software netflow exporter
 endef
 
-define Build/Configure
-	$(call Build/Configure/Default)
-	$(call libtool_disable_rpath)
-endef
-
 define Build/Compile
-	$(call libtool_fixup_libdir,$(PKG_INSTALL_DIR))
 	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" softflowd softflowctl
 endef
 
diff --git a/net/subversion/Makefile b/net/subversion/Makefile
index 3d5f8dc08..4fe609455 100644
--- a/net/subversion/Makefile
+++ b/net/subversion/Makefile
@@ -16,6 +16,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://subversion.tigris.org/downloads/
 PKG_MD5SUM:=4c333a5fe827568c67d195cda7a5e154
 
+PKG_FIXUP = libtool
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/subversion/Default
@@ -66,13 +68,7 @@ CONFIGURE_VARS += \
 	CPPFLAGS="-I$(STAGING_DIR)/usr/include/ -I$(STAGING_DIR)/usr/lib/libintl/include \
 		-I$(STAGING_DIR)/include/" \
 
-define Build/Configure
-	$(call Build/Configure/Default)
-	$(call libtool_disable_rpath)
-endef
-
 define Build/Compile
-	$(call libtool_fixup_libdir,$(PKG_INSTALL_DIR))
 	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" all local-install
 endef
 
diff --git a/net/weechat/Makefile b/net/weechat/Makefile
index f5c957973..77b876da4 100644
--- a/net/weechat/Makefile
+++ b/net/weechat/Makefile
@@ -16,6 +16,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://weechat.flashtux.org/download/
 PKG_MD5SUM:=42f96620c3b2fd3dca9768d9ce16dd06
 
+PKG_FIXUP = libtool
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/weechat/Default
@@ -92,16 +94,8 @@ else
 	--disable-lua
 endif
 
-
-define Build/Configure
-	$(call Build/Configure/Default)
-	$(call libtool_disable_rpath)
-endef
-
 define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) all
-	$(call libtool_fixup_libdir,$(PKG_INSTALL_DIR))
-	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install
+	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" all install
 endef
 
 define Package/weechat/install	
diff --git a/utils/lcd4linux/Makefile b/utils/lcd4linux/Makefile
index a3d1aec8c..573a424b9 100644
--- a/utils/lcd4linux/Makefile
+++ b/utils/lcd4linux/Makefile
@@ -19,6 +19,8 @@ PKG_SOURCE_SUBDIR:=lcd4linux-$(PKG_VERSION)
 PKG_SOURCE_VERSION:=$(PKG_REV)
 PKG_SOURCE_PROTO:=svn
 
+PKG_FIXUP = libtool
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/lcd4linux
@@ -55,15 +57,8 @@ CONFIGURE_ARGS += \
 	--with-plugins="$(PKG_CONFIGURE_PLUGINS)" \
 	--disable-rpath \
 
-define Build/Configure
-	$(call Build/Configure/Default,)
-	$(call libtool_disable_rpath)
-endef
-
 define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) all
-	$(call libtool_fixup_libdir,$(PKG_INSTALL_DIR))
-	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)"
+	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" all install
 endef
 
 define Package/lcd4linux/install
diff --git a/utils/rrdtool/Makefile b/utils/rrdtool/Makefile
index e04671823..2d0752cb8 100644
--- a/utils/rrdtool/Makefile
+++ b/utils/rrdtool/Makefile
@@ -17,6 +17,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_MD5SUM:=dafa161bc9c61e57636a6085c87c1fe8
 
 PKG_BUILD_DEPENDS:=libnotimpl python-core
+PKG_FIXUP = libtool
 
 include $(INCLUDE_DIR)/package.mk
 -include $(if $(DUMP),,$(STAGING_DIR)/mk/python-package.mk)
@@ -89,15 +90,8 @@ else
   CONFIGURE_ARGS += --disable-python
 endif
 
-define Build/Configure
-	$(call Build/Configure/Default)
-	$(call libtool_disable_rpath)
-endef
-
 define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) all
-	$(call libtool_fixup_libdir)
-	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install
+	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" all install
 endef
 
 define Build/InstallDev