Merge branch 'ssp'

[people/pmueller/ipfire-3.x.git] / lfs / gettext

diff --git a/lfs/gettext b/lfs/gettext
index b366d84cf38e020d78875d83392b00aef24c0ddb..66f00d02f956f649f48ad55ba8a4e30e0801ea97 100644 (file)
--- a/lfs/gettext
+++ b/lfs/gettext
@@ -31,7 +31,7 @@ THISAPP    = $(PKG_NAME)-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
-TARGET     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
 
 ###############################################################################
 # Top-level Rules
@@ -41,16 +41,16 @@ objects = $(DL_FILE)
 
 install : $(TARGET)
 
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
+download : $(objects)
 
-$(patsubst %,$(DIR_DL)/%,$(objects)) :
+$(objects) :
        @$(LOAD)
 
 ###############################################################################
 # Installation Details
 ###############################################################################
 
-$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+$(TARGET) : 
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        
@@ -63,9 +63,22 @@ endif
 
 ifeq "$(STAGE)" "base"
        cd $(DIR_APP) && ./configure --prefix=/usr --disable-static
-       cd $(DIR_APP) && make -j $(PARALLELISM)
+       cd $(DIR_APP) && make $(PARALLELISMFLAGS)
        cd $(DIR_APP) && make install
 endif
 
+ifeq "$(STAGE)" "installer"
+       cd $(DIR_APP)/gettext-runtime && $(U_TOOLS) ./configure \
+                                               --prefix=/usr \
+                                               --target=$(UCLIBC_TARGET) \
+                                               --host=$(UCLIBC_TARGET) \
+                                               --with-included-gettext \
+                                               --without-csharp \
+                                               --disable-libasprintf
+       cd $(DIR_APP)/gettext-runtime && make -C intl/ $(PARALLELISMFLAGS)
+       cd $(DIR_APP)/gettext-runtime && make -C intl/ install \
+               DESTDIR=$(INSTALLER_DIR)
+endif
+
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)