add option to select target installation per case 0000519

diff --git a/package/gettext/Config.in b/package/gettext/Config.in
index bcb51ee89aba8620a59c04dfb512660a3209fbe6..9a606a1a261b1b6565db13c4605304b840b0ef27 100644 (file)
--- a/package/gettext/Config.in
+++ b/package/gettext/Config.in
@@ -7,3 +7,12 @@ config BR2_PACKAGE_GETTEXT
          messages.
 
          http://www.gnu.org/software/gettext/
+
+config BR2_PACKAGE_LIBINTL
+       bool "libintl"
+       default n
+       help
+         Selecting this package installs all of gettext in the staging
+         directory and the shared library for it's use in the target.
+
+         http://www.gnu.org/software/gettext/

diff --git a/package/gettext/gettext.mk b/package/gettext/gettext.mk
index c278a37c8cdca4b766b1ca7c422a25498b1ade9b..15ee497eeaea706c58fe2255c09d2bc4fde31f75 100644 (file)
--- a/package/gettext/gettext.mk
+++ b/package/gettext/gettext.mk
@@ -43,14 +43,10 @@ $(GETTEXT_DIR)/.configured: $(GETTEXT_DIR)/.unpacked
 $(GETTEXT_DIR)/$(GETTEXT_BINARY): $(GETTEXT_DIR)/.configured
        $(MAKE) CC=$(TARGET_CC) -C $(GETTEXT_DIR)
 
-$(TARGET_DIR)/$(GETTEXT_TARGET_BINARY): $(GETTEXT_DIR)/$(GETTEXT_BINARY)
+$(STAGING_DIR)/$(GETTEXT_TARGET_BINARY): $(GETTEXT_DIR)/$(GETTEXT_BINARY)
        $(MAKE) DESTDIR=$(STAGING_DIR) CC=$(TARGET_CC) -C $(GETTEXT_DIR) install
-       $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(GETTEXT_DIR) install
-       rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
-               $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc \
-               $(TARGET_DIR)/usr/doc
 
-gettext: uclibc $(TARGET_DIR)/$(GETTEXT_TARGET_BINARY)
+gettext: uclibc $(STAGING_DIR)/$(GETTEXT_TARGET_BINARY)
 
 gettext-clean:
        $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(GETTEXT_DIR) uninstall
@@ -59,11 +55,35 @@ gettext-clean:
 gettext-dirclean:
        rm -rf $(GETTEXT_DIR)
 
+#############################################################
+#
+# gettext on the target
+#
+#############################################################
+   
+gettext-target: $(GETTEXT_DIR)/$(GETTEXT_BINARY)
+       $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(GETTEXT_DIR) install
+       chmod +x $(TARGET_DIR)/usr/lib/libintl.so.2.2.0 # identify as needing to be stipped
+       rm -rf  $(TARGET_DIR)/usr/info \
+               $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc \
+               $(TARGET_DIR)/usr/doc $(TARGET_DIR)/usr/share/aclocal \
+               $(TARGET_DIR)/usr/include/libintl.h
+       -rmdir $(TARGET_DIR)/usr/include
+   
+libintl: $(TARGET_DIR)/usr/lib/libintl.so
+
+$(TARGET_DIR)/usr/lib/libintl.so: $(STAGING_DIR)/$(GETTEXT_TARGET_BINARY)
+       cp -a $(STAGING_DIR)/usr/lib/libintl.so* $(TARGET_DIR)/usr/lib
+       touch $@
+    
 #############################################################
 #
 # Toplevel Makefile options
 #
 #############################################################
+ifeq ($(strip $(BR2_PACKAGE_LIBINTL)),y)
+TARGETS+=libintl
+endif
 ifeq ($(strip $(BR2_PACKAGE_GETTEXT)),y)
-TARGETS+=gettext
+TARGETS+=gettext-target
 endif