X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=libs%2Fgettext%2FMakefile;h=b0caee455b7791cf9c277277d41b26685a2b8ac3;hp=b6951fca41ab010d96f51b3881181ac6fda61bdc;hb=182a861cfad041774d27f0317c426e6650d0e212;hpb=7563e1413d214f09e4acfd22ef2a1f3a92a1ee0d

diff --git a/libs/gettext/Makefile b/libs/gettext/Makefile
index b6951fca41..b0caee455b 100644
--- a/libs/gettext/Makefile
+++ b/libs/gettext/Makefile
@@ -16,9 +16,6 @@ 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
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libintl
@@ -41,11 +38,18 @@ CONFIGURE_ARGS += \
 	--without-libexpat-prefix \
 	--without-emacs
 
-MAKE_FLAGS += \
-	DESTDIR="$(PKG_INSTALL_DIR)" \
-	all install
+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
+endef
 
-define Build/InstallDev
+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