enable libtool fixups for atk

[openwrt/svn-archive/archive.git] / XOrg / lib / atk / Makefile

diff --git a/XOrg/lib/atk/Makefile b/XOrg/lib/atk/Makefile
index 55015e4bbbd73acbb4ed8a7c2b4cfc0dbc348c9b..86b7e30b4a7f833dc1d98001673c46ffad2bcfb6 100644 (file)
--- a/XOrg/lib/atk/Makefile
+++ b/XOrg/lib/atk/Makefile
@@ -14,9 +14,12 @@ PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://ftp.gnome.org/pub/gnome/sources/atk/1.11/
+PKG_FIXUP:=libtool
 
 include $(INCLUDE_DIR)/package.mk
 
+EXTRA_LDFLAGS:=-L$(STAGING_DIR)/usr/lib/libiconv/lib/ -L$(STAGING_DIR)/usr/lib/libintl/lib/
+
 define Package/atk
   SECTION:=xorg-libs
   CATEGORY:=Xorg
@@ -38,19 +41,14 @@ define Build/Configure
 endef
 
 define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR)
-       $(MAKE) -C $(PKG_BUILD_DIR)/ install DESTDIR=$(PKG_INSTALL_DIR)
+       $(MAKE) -C $(PKG_BUILD_DIR) all install DESTDIR=$(PKG_INSTALL_DIR)
 endef
 
 define Build/InstallDev
-       $(INSTALL_DIR) $(STAGING_DIR)/usr/{lib,include}
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib* $(STAGING_DIR)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/ $(STAGING_DIR)/usr/lib/
-       $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(STAGING_DIR)/usr/include/
-       $(SED)  "s,"prefix\=.*",prefix=$(STAGING_DIR)/usr," $(STAGING_DIR)/usr/lib/pkgconfig/atk.pc
-       $(SED)  "s,"exec_prefix\=.*",exec_prefix=$(STAGING_DIR)/usr," $(STAGING_DIR)/usr/lib/pkgconfig/atk.pc
-       $(SED)  "s,"libdir\=\'/usr/lib\'",libdir='$(STAGING_DIR)/usr/lib\'," $(STAGING_DIR)/usr/lib/libatk-1.0.la
-       $(SED)  "s,Libs:,Libs: -L$(STAGING_DIR)/usr/lib/libiconv/lib/ -L$(STAGING_DIR)/usr/lib/libintl/lib/ ,g" $(STAGING_DIR)/usr/lib/pkgconfig/atk.pc
+       $(INSTALL_DIR) $(1)/usr/{lib,include}
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib* $(1)/usr/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/ $(1)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
 endef
 
 define Package/atk/Install