Kudzu, ReiserFS, uClibc, gettext und Arbeit am Installer

[people/teissler/ipfire-2.x.git] / lfs / popt

diff --git a/lfs/popt b/lfs/popt
index 780f36f11bb43457a01ee934a9fb73755cb76260..0daa5081982a52ea75812131ca78f16ccee2b97b 100644 (file)
--- a/lfs/popt
+++ b/lfs/popt
@@ -32,7 +32,11 @@ THISAPP    = popt-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
+ifeq "$(LFS_PASS)" "install"
+       TARGET = $(DIR_INFO)/$(THISAPP)-installer
+else
+       TARGET = $(DIR_INFO)/$(THISAPP)
+endif
 
 ###############################################################################
 # Top-level Rules
@@ -72,10 +76,16 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ifeq "$(LFS_PASS)" "install"
+       cd $(DIR_APP) && ./configure --prefix=/ --disable-nls
+       cd $(DIR_APP) && make $(MAKETUNING)
+       cd $(DIR_APP) && make DESTDIR=/opt/$(MACHINE)-uClibc install
+else
        cd $(DIR_APP) && sed -i -e "/*origOptString ==/c 0)" popt.c
        cd $(DIR_APP) && autoreconf -f -i
        cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
+endif
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)