Fix st2205tool dependency against libgd

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

diff --git a/libs/gettext/Makefile b/libs/gettext/Makefile
index 36deebf6273230c1beda667f103bc43bdb23bdb6..8121ab0474e541bd05e2fe3f53c3c119d48cc09e 100644 (file)
--- a/libs/gettext/Makefile
+++ b/libs/gettext/Makefile
@@ -16,6 +16,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/gettext
 PKG_MD5SUM:=3d9ad24301c6d6b17ec30704a13fe127
 
+PKG_FIXUP = libtool
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libintl
@@ -25,6 +27,8 @@ define Package/libintl
   URL:=http://www.gnu.org/software/gettext/
 endef
 
+TARGET_CFLAGS += $(FPIC)
+
 CONFIGURE_ARGS += \
        --enable-shared \
        --enable-static \
@@ -38,31 +42,20 @@ CONFIGURE_ARGS += \
        --without-libexpat-prefix \
        --without-emacs
 
-define Build/Configure
-       $(call Build/Configure/Default)
-       $(call libtool_disable_rpath)
-endef
-
 define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) all
-       $(call libtool_fixup_libdir,$(PKG_INSTALL_DIR))
-       $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install
+       $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" all install
 endef
 
 define Build/InstallDev        
        mkdir -p $(1)/usr/lib/libintl/include
-       $(CP) $(PKG_INSTALL_DIR)/usr/include/libintl.h $(1)/usr/lib/libintl/include/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/include/libintl.h $(1)/usr/lib/libintl/include/
        mkdir -p $(1)/usr/lib/libintl/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libintl.{a,so*} $(1)/usr/lib/libintl/lib/
-endef
-
-define Build/UninstallDev      
-       rm -rf  $(STAGING_DIR)/usr/lib/libintl
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libintl.{a,so*} $(1)/usr/lib/libintl/lib/
 endef
 
 define Package/libintl/install
        $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libintl.so.* $(1)/usr/lib/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libintl.so.* $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,libintl))