X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=libs%2Fglib%2FMakefile;h=024c8c85753ce1b15fb41106c59b8b1a1df70af0;hp=6d37b444c080f6c6e0ee4828180dd5f7234e6555;hb=e6103621a7b09b8dced6503ad763e595d86e4f8e;hpb=289168da7d3b3b20ca039539871483bd25a4e325

diff --git a/libs/glib/Makefile b/libs/glib/Makefile
index 6d37b444c0..024c8c8575 100644
--- a/libs/glib/Makefile
+++ b/libs/glib/Makefile
@@ -56,20 +56,20 @@ 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" \
 
+TARGET_LDFLAGS += -L$(TOOLCHAIN_DIR)/lib
 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" all install
 endef
 
 define Build/InstallDev
-	$(INSTALL_DIR) $(1)
+	$(INSTALL_DIR) $(1) $(2)/bin
 	$(CP) $(PKG_INSTALL_DIR)/* $(1)/
 	$(CP) $(PKG_BUILD_DIR)/.libs/*.a $(PKG_BUILD_DIR)/*/.libs/*.a $(1)/usr/lib
 	$(CP) $(PKG_BUILD_DIR)/glibconfig-sysdefs.h $(1)/usr/include/glib-1.2/
-	$(INSTALL_DIR) $(2)/bin
-	mv $(1)/usr/bin/glib-config $(2)/bin/
-	$(SED) 's,-I$$$${prefix}/include/glib,-I$(STAGING_DIR)/usr/include/glib,g' $(2)/bin/glib-config
-	$(SED) 's,-I$$$${exec_prefix}/lib/glib,-I$(STAGING_DIR)/usr/lib/glib,g' $(2)/bin/glib-config
-	$(SED) 's,-L$$$${exec_prefix}/lib,,g' $(2)/bin/glib-config
+	ln -sf $(STAGING_DIR)/usr/bin/glib-config $(2)/bin/
+	$(SED) 's,-I$$$${prefix}/include/glib,-I$(STAGING_DIR)/usr/include/glib,g' $(1)/usr/bin/glib-config
+	$(SED) 's,-I$$$${exec_prefix}/lib/glib,-I$(STAGING_DIR)/usr/lib/glib,g' $(1)/usr/bin/glib-config
+	$(SED) 's,-L$$$${exec_prefix}/lib,,g' $(1)/usr/bin/glib-config
 endef
 
 define Package/glib1/install