seds in gtk+-2 were effecting gtk+-1 files

git-svn-id: svn://svn.openwrt.org/openwrt/packages@9158 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/XOrg/lib/gtk-1.2.10/Makefile b/XOrg/lib/gtk-1.2.10/Makefile
index a1a1820..56796dc 100644 (file)
--- a/XOrg/lib/gtk-1.2.10/Makefile
+++ b/XOrg/lib/gtk-1.2.10/Makefile
@@ -55,6 +55,10 @@ endef
 
 define Build/InstallDev
        $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR)/
+       $(SED) "s,libdirs=-L.*,libdirs=,g" $(STAGING_DIR)/usr/bin/gtk-config
+       $(SED) "s,"prefix\=.*",prefix=$(STAGING_DIR)/usr," $(STAGING_DIR)/usr/lib/pkgconfig/{gtk,gdk}*.pc
+       $(SED) "s,"exec_prefix\=.*",exec_prefix=$(STAGING_DIR)/usr," $(STAGING_DIR)/usr/lib/pkgconfig/{gtk+,gdk}.pc
+       $(SED) "s,"libdir\=\'/usr/lib\'",libdir='$(STAGING_DIR)/usr/lib\'," $(STAGING_DIR)/usr/lib/lib{gtk,gdk}.la
 endef
 
 $(eval $(call BuildPackage,gtk-1.2.10))

diff --git a/XOrg/lib/gtk-2.8.20/Makefile b/XOrg/lib/gtk-2.8.20/Makefile
index ebe1dfa..972c563 100644 (file)
--- a/XOrg/lib/gtk-2.8.20/Makefile
+++ b/XOrg/lib/gtk-2.8.20/Makefile
@@ -52,9 +52,9 @@ define Build/InstallDev
        $(CP) -r $(PKG_INSTALL_DIR)/usr/include/* $(STAGING_DIR)/include/
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.{la,so.*} $(STAGING_DIR)/usr/lib/
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* $(STAGING_DIR)/usr/lib/pkgconfig/
-       $(SED) "s,"prefix\=.*",prefix=$(STAGING_DIR)/usr," $(STAGING_DIR)/usr/lib/pkgconfig/{gtk,gdk}*.pc
-       $(SED) "s,"exec_prefix\=.*",exec_prefix=$(STAGING_DIR)/usr," $(STAGING_DIR)/usr/lib/pkgconfig/{gtk,gdk}*.pc
-       $(SED) "s,"libdir\=\'/usr/lib\'",libdir='$(STAGING_DIR)/usr/lib\'," $(STAGING_DIR)/usr/lib/lib{gtk,gdk}*.la
+       $(SED) "s,"prefix\=.*",prefix=$(STAGING_DIR)/usr," $(STAGING_DIR)/usr/lib/pkgconfig/{gtk,gdk}*-2.0.pc
+       $(SED) "s,"exec_prefix\=.*",exec_prefix=$(STAGING_DIR)/usr," $(STAGING_DIR)/usr/lib/pkgconfig/{gtk,gdk}*-2.0.pc
+       $(SED) "s,"libdir\=\'/usr/lib\'",libdir='$(STAGING_DIR)/usr/lib\'," $(STAGING_DIR)/usr/lib/lib{gtk,gdk}*-2.0.la
 endef
 
 $(eval $(call BuildPackage,gtk-2.8.20))