Index: package/libs/glib2/Makefile
===================================================================
--- package/libs/glib2/Makefile (revision 9049)
+++ package/libs/glib2/Makefile (working copy)
@@ -22,6 +22,21 @@
 
 include $(INCLUDE_DIR)/package.mk
 
+CONFIGURE_ARGS += \
+               --enable-shared \
+               --enable-static
+
+EXTRA_LDFLAGS += \
+       -L$(STAGING_DIR)/usr/lib/libiconv/lib \
+       -L$(STAGING_DIR)/usr/lib/libintl/lib
+
+EXTRA_CPPFLAGS += \
+       -I$(STAGING_DIR)/usr/lib/libiconv/include \
+       -I$(STAGING_DIR)/usr/lib/libintl/include
+
+CONFIGURE_VARS += glib_cv_stack_grows=no \
+       glib_cv_uscore=no
+
 define Package/glib2
   SECTION:=libs
   CATEGORY:=Libraries
@@ -32,23 +47,14 @@
 endef
 
 define Build/Configure
-       $(call Build/Configure/Default, \
-               --enable-shared \
-               --enable-static \
-               LDFLAGS="-L$(STAGING_DIR)/usr/lib/libiconv/lib \
-                       -L$(STAGING_DIR)/usr/lib/libintl/lib" \
-               CPPFLAGS="-I$(STAGING_DIR)/usr/lib/libiconv/include \
-                       -I$(STAGING_DIR)/usr/lib/libintl/include" \
-               , \
-               glib_cv_stack_grows=no \
-               glib_cv_uscore=no \
-       )
+       $(call Build/Configure/Default)
+       $(call libtool_disable_rpath)
 endef
 
 define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
+       $(MAKE) -C $(PKG_BUILD_DIR) all 
+       $(call libtool_fixup_libdir,$(PKG_INSTALL_DIR)) 
+       $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install
 endef
 
 
@@ -61,8 +67,10 @@
        mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* $(STAGING_DIR)/usr/lib/pkgconfig
        $(SED)  "s,"libdir\=\'/usr/lib\'",libdir='$(STAGING_DIR)/usr/lib\'," $(STAGING_DIR)/usr/lib/{libglib,libgmodule,libgobject,libgthread}-2.0.la
+       $(SED)  "s,/usr/lib/libglib-2.0.la,$(STAGING_DIR)/usr/lib/libglib-2.0.la,g" $(STAGING_DIR)/usr/lib/{libglib,libgmodule,libgobject,libgthread}-2.0.la
+       $(SED)  "s,$(BUILD_DIR)/glib-$(PKG_VERSION)/ipkg-install,,g" $(STAGING_DIR)/usr/lib/{libglib,libgmodule,libgobject,libgthread}-2.0.la
        $(SED)  "s,"prefix\=/usr",prefix=$(STAGING_DIR)/usr," $(STAGING_DIR)/usr/lib/pkgconfig/{glib,gmodule,gmodule-export,gmodule-no-export,gobject,gthread}-2.0.pc
-       $(SED)  "s,"exec_prefix\=/usr",exec_prefix=$(STAGING_DIR)/usr," $(STAGING_DIR)/usr/lib/pkgconfig/{glib,gmodule,gmodule-export,gmodule-no-export,gobject,gthread}-2.0.pc
+       $(SED)  "s,"exec_prefix\=.*",exec_prefix=$(STAGING_DIR)/usr," $(STAGING_DIR)/usr/lib/pkgconfig/{glib,gmodule,gmodule-export,gmodule-no-export,gobject,gthread}-2.0.pc
 endef
 
 define Build/UninstallDev