X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fpopt;h=ee4c3f914c35ccdac3ba8b26abff8cebf04d3bff;hb=1cfa43b31b246141291c7f2430a92c9af37d63a5;hp=25fcc69cbb2a3605335e812b4335504cb3fa9988;hpb=70df830214c97a68fcb7e89ae0d7df58c35590be;p=ipfire-2.x.git

diff --git a/lfs/popt b/lfs/popt
index 25fcc69cbb..ee4c3f914c 100644
--- a/lfs/popt
+++ b/lfs/popt
@@ -30,11 +30,7 @@ THISAPP    = popt-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
-ifeq "$(LFS_PASS)" "install"
-	TARGET = $(DIR_INFO)/$(THISAPP)-install
-else
-	TARGET = $(DIR_INFO)/$(THISAPP)
-endif
+TARGET     = $(DIR_INFO)/$(THISAPP)
 
 ###############################################################################
 # Top-level Rules
@@ -74,16 +70,9 @@ $(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)