X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Finstaller;h=6a0662c9308fd6e83af4e3e5ad32a27d487d8036;hb=3c73b7fbf02f29e4f4b9ca72bf22e480ca2cf74c;hp=29095eb69e242565f094f16fe2bcc4b1b0784cbb;hpb=f0fa1795c4fe1b3c2f0d9022f9ebf47a879c0970;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/installer b/lfs/installer
index 29095eb69e..6a0662c930 100644
--- a/lfs/installer
+++ b/lfs/installer
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2012  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -30,6 +30,9 @@ THISAPP    = installer
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
+SLOGAN     = An Open Source Firewall Solution
+DOWNLOAD_URL = https://downloads.ipfire.org/releases/ipfire-2.x/$(VERSION)-core$(CORE)/$(SNAME)-$(VERSION).$(BUILD_ARCH)-full-core$(CORE).iso
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -48,23 +51,20 @@ md5 :
 
 $(TARGET) :
 	@$(PREBUILD)
-	-mkdir -p /install/initrd/bin
-	@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)\"'" 
-	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 -v -m 0755 install probenic.sh \
-		downloadsource.sh mountdest.sh /install/initrd/bin
-	#Patch ISO Name for download ...
-	sed -i -e "s|ipfire.iso|download.ipfire.org/releases/ipfire-2.x/$(VERSION)-core$(CORE)/$(SNAME)-$(VERSION).$(MACHINE)-full-core$(CORE).iso|g" \
-				/install/initrd/bin/downloadsource.sh
-	#Patch version for mediacheck ...
+	@rm -rf $(DIR_APP) && mkdir $(DIR_APP) && cp -R $(DIR_SRC)/src/installer/* $(DIR_APP)
+
+	cd $(DIR_APP) && ./autogen.sh
+	cd $(DIR_APP) && ./configure \
+		--prefix=/usr \
+		--with-distro-name="$(NAME)" \
+		--with-distro-sname="$(SNAME)" \
+		--with-distro-slogan="$(SLOGAN)" \
+		--with-distro-version="$(VERSION)-core$(CORE)" \
+		--with-config-root="$(CONFIG_ROOT)" \
+		--with-download-url="$(DOWNLOAD_URL)"
+
+	cd $(DIR_APP) && make $(MAKETUNING)
+	cd $(DIR_APP) && make install
+
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)