fix getext libtool fsckups

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

diff --git a/libs/gettext/Makefile b/libs/gettext/Makefile
index b6951fca41ab010d96f51b3881181ac6fda61bdc..c01303fe360ae1a0f1e9dc2bd863b3fc9e76a889 100644 (file)
--- a/libs/gettext/Makefile
+++ b/libs/gettext/Makefile
@@ -16,8 +16,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/gettext
 PKG_MD5SUM:=3d9ad24301c6d6b17ec30704a13fe127
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_FIXUP = libtool
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -28,6 +27,8 @@ define Package/libintl
   URL:=http://www.gnu.org/software/gettext/
 endef
 
+TARGET_CFLAGS += $(FPIC)
+
 CONFIGURE_ARGS += \
        --enable-shared \
        --enable-static \
@@ -41,24 +42,24 @@ CONFIGURE_ARGS += \
        --without-libexpat-prefix \
        --without-emacs
 
-MAKE_FLAGS += \
-       DESTDIR="$(PKG_INSTALL_DIR)" \
-       all install
+define Build/Compile
+       $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" all
+endef
 
-define Build/InstallDev
-       mkdir -p $(STAGING_DIR)/usr/lib/libintl/include
-       $(CP) $(PKG_INSTALL_DIR)/usr/include/libintl.h $(STAGING_DIR)/usr/lib/libintl/include/
-       mkdir -p $(STAGING_DIR)/usr/lib/libintl/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libintl.{a,so*} $(STAGING_DIR)/usr/lib/libintl/lib/
+define Build/Install
+       $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install
 endef
 
-define Build/UninstallDev      
-       rm -rf  $(STAGING_DIR)/usr/lib/libintl
+define Build/InstallDev        
+       mkdir -p $(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
+       $(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))