fix glib1/gtk1 compile

[openwrt/svn-archive/archive.git] / libs / glib / Makefile

diff --git a/libs/glib/Makefile b/libs/glib/Makefile
index 6d37b444c080f6c6e0ee4828180dd5f7234e6555..024c8c85753ce1b15fb41106c59b8b1a1df70af0 100644 (file)
--- 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