X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Finstaller;h=1f0f89fcf3a26d91713c8e2ce14d5a5dfd237f2d;hb=786f2c8a296f053a6db934993a0611f1dadb8db5;hp=22db3cb7f126aee8b46750ad7fb42c1d16306002;hpb=cd1a2927226c734d96478e12bb768256fb64a06a;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/installer b/lfs/installer
index 22db3cb7f1..1f0f89fcf3 100644
--- a/lfs/installer
+++ b/lfs/installer
@@ -18,12 +18,6 @@
 # Makefiles are based on LFSMake, which is                                    #
 # Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
 #                                                                             #
-# Modifications by:                                                           #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id: installer,v 1.6.2.5 2006/01/11 01:01:38 franck78 Exp $
-#                                                                             #
 ###############################################################################
 
 ###############################################################################
@@ -32,6 +26,8 @@
 
 include Config
 
+VER = ipfire
+
 THISAPP    = installer
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -55,16 +51,17 @@ md5 :
 $(TARGET) :
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && mkdir $(DIR_APP) && cp -R $(DIR_SRC)/src/install+setup/* $(DIR_APP)
-	
+	for i in $(DIR_SRC)/langs/*/install/lang_*.c ; do \
+	    cp $$i $(DIR_APP)/libsmooth; \
+	done
+	cd $(DIR_APP)/libsmooth && chmod 755 makelangs.pl
 	cd $(DIR_APP)/libsmooth && make CFLAGS="-Os -fomit-frame-pointer -Wall \
 	    -DNAME='\"$(NAME)\"' -DSNAME='\"$(SNAME)\"' -DVERSION='\"$(VERSION)\"' \
-	     -DSLOGAN='\"$(SLOGAN)\"' -DCONFIG_ROOT='\"$(CONFIG_ROOT)\"'"
-
+	     -DSLOGAN='\"$(SLOGAN)\"' -DCONFIG_ROOT='\"$(CONFIG_ROOT)\"'" 
 	cd $(DIR_APP)/install && make CFLAGS="-Os -fomit-frame-pointer -Wall \
 	    -DNAME='\"$(NAME)\"' -DSNAME='\"$(SNAME)\"' -DVERSION='\"$(VERSION)\"' \
 	     -DSLOGAN='\"$(SLOGAN)\"' -DCONFIG_ROOT='\"$(CONFIG_ROOT)\"' -DKERNEL_VERSION='\"$(KVER)\"'"
-
-	cd $(DIR_APP)/install && install -m 0755 install probescsi.sh /install/initrd/bin
-	cd $(DIR_APP)/install && install -m 0755 install2  /usr/local/bin
+	cd $(DIR_APP)/install && install -v -m 0755 install probenic.sh \
+		probecntrl.sh probehw.sh installbootsplash.sh mountsource.sh /install/initrd/bin
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)