From e65a746939595de44ecf5e8309903617cd481b49 Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sun, 19 Dec 2010 02:34:55 +0000
Subject: [PATCH] move and rename gettext to gettext-full

SVN-Revision: 24698
---
 libs/{gettext => gettext-full}/Makefile       | 21 ++++++++++---------
 .../patches/001-autotools.patch               |  0
 .../patches/001-no_examples_and_tests.patch   |  0
 .../003-gettext-error_print_progname.patch    |  0
 .../004-gnulib-uclibc-sched_param-def.patch   |  0
 .../patches/100-error_progname.patch          |  0
 .../patches/120-uclibc-nolocale.patch         |  0
 .../patches/150-disable_libxml_iconv.patch    |  0
 8 files changed, 11 insertions(+), 10 deletions(-)
 rename libs/{gettext => gettext-full}/Makefile (68%)
 rename libs/{gettext => gettext-full}/patches/001-autotools.patch (100%)
 rename libs/{gettext => gettext-full}/patches/001-no_examples_and_tests.patch (100%)
 rename libs/{gettext => gettext-full}/patches/003-gettext-error_print_progname.patch (100%)
 rename libs/{gettext => gettext-full}/patches/004-gnulib-uclibc-sched_param-def.patch (100%)
 rename libs/{gettext => gettext-full}/patches/100-error_progname.patch (100%)
 rename libs/{gettext => gettext-full}/patches/120-uclibc-nolocale.patch (100%)
 rename libs/{gettext => gettext-full}/patches/150-disable_libxml_iconv.patch (100%)

diff --git a/libs/gettext/Makefile b/libs/gettext-full/Makefile
similarity index 68%
rename from libs/gettext/Makefile
rename to libs/gettext-full/Makefile
index 1b3a50eff..860b79b0d 100644
--- a/libs/gettext/Makefile
+++ b/libs/gettext-full/Makefile
@@ -7,13 +7,14 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_NAME:=gettext
+PKG_NAME:=gettext-full
 PKG_VERSION:=0.18.1.1
 PKG_RELEASE:=1
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE:=gettext-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/gettext
 PKG_MD5SUM:=3dd55b952826d2b32f51308f2f91aa89
+PKG_BUILD_DIR:=$(BUILD_DIR)/gettext-$(PKG_VERSION)
 
 PKG_FIXUP:=libtool
 PKG_INSTALL:=1
@@ -21,7 +22,7 @@ PKG_BUILD_PARALLEL:=0
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/libintl
+define Package/libintl-full
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=GNU Internationalization library
@@ -44,19 +45,19 @@ CONFIGURE_ARGS += \
 	--without-emacs
 
 define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/include/libintl.h $(1)/usr/include/
+	$(INSTALL_DIR) $(1)/usr/include/gettext-full
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/include/libintl.h $(1)/usr/include/gettext-full/
 
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libintl.{a,so*} $(1)/usr/lib
+	$(INSTALL_DIR) $(1)/usr/lib/gettext-full
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libintl.{a,so*} $(1)/usr/lib/gettext-full/
 
 	$(INSTALL_DIR) $(1)/usr/share/aclocal
 	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/aclocal/* $(1)/usr/share/aclocal/
 endef
 
-define Package/libintl/install
+define Package/libintl-full/install
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libintl.so.* $(1)/usr/lib/
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libintl.so.* $(1)/usr/lib/
 endef
 
-$(eval $(call BuildPackage,libintl))
+$(eval $(call BuildPackage,libintl-full))
diff --git a/libs/gettext/patches/001-autotools.patch b/libs/gettext-full/patches/001-autotools.patch
similarity index 100%
rename from libs/gettext/patches/001-autotools.patch
rename to libs/gettext-full/patches/001-autotools.patch
diff --git a/libs/gettext/patches/001-no_examples_and_tests.patch b/libs/gettext-full/patches/001-no_examples_and_tests.patch
similarity index 100%
rename from libs/gettext/patches/001-no_examples_and_tests.patch
rename to libs/gettext-full/patches/001-no_examples_and_tests.patch
diff --git a/libs/gettext/patches/003-gettext-error_print_progname.patch b/libs/gettext-full/patches/003-gettext-error_print_progname.patch
similarity index 100%
rename from libs/gettext/patches/003-gettext-error_print_progname.patch
rename to libs/gettext-full/patches/003-gettext-error_print_progname.patch
diff --git a/libs/gettext/patches/004-gnulib-uclibc-sched_param-def.patch b/libs/gettext-full/patches/004-gnulib-uclibc-sched_param-def.patch
similarity index 100%
rename from libs/gettext/patches/004-gnulib-uclibc-sched_param-def.patch
rename to libs/gettext-full/patches/004-gnulib-uclibc-sched_param-def.patch
diff --git a/libs/gettext/patches/100-error_progname.patch b/libs/gettext-full/patches/100-error_progname.patch
similarity index 100%
rename from libs/gettext/patches/100-error_progname.patch
rename to libs/gettext-full/patches/100-error_progname.patch
diff --git a/libs/gettext/patches/120-uclibc-nolocale.patch b/libs/gettext-full/patches/120-uclibc-nolocale.patch
similarity index 100%
rename from libs/gettext/patches/120-uclibc-nolocale.patch
rename to libs/gettext-full/patches/120-uclibc-nolocale.patch
diff --git a/libs/gettext/patches/150-disable_libxml_iconv.patch b/libs/gettext-full/patches/150-disable_libxml_iconv.patch
similarity index 100%
rename from libs/gettext/patches/150-disable_libxml_iconv.patch
rename to libs/gettext-full/patches/150-disable_libxml_iconv.patch
-- 
2.30.2