# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1417857194 -3600
# Node ID 0df59f69c90c4d0d8a9064853d671850b2a0ae91
# Parent  81e51336083b88e138c2b87b7959b3bf0bcc1c78
tazinst: install bzImage64

diff -r 81e51336083b -r 0df59f69c90c Makefile
--- a/Makefile	Fri Oct 17 18:00:21 2014 +0200
+++ b/Makefile	Sat Dec 06 10:13:14 2014 +0100
@@ -75,9 +75,11 @@
 	@echo "Installing slitaz-installer into $(DESTDIR)$(PREFIX)/sbin..."
 	mkdir -p $(DESTDIR)$(PREFIX)/sbin
 	install -m 0755 slitaz-installer $(DESTDIR)$(PREFIX)/sbin
+	-[ "$(VERSION)" ] && sed -i 's/^VERSION=["0-9].*/VERSION=$(VERSION)/' $(DESTDIR)$(PREFIX)/sbin/slitaz-installer
 	@echo "Installing installer.cgi into $(DESTDIR)$(TAZPANEL)..."
 	mkdir -p $(DESTDIR)$(TAZPANEL)/menu.d
 	install -m 0755 installer.cgi $(DESTDIR)$(TAZPANEL)
+	-[ "$(VERSION)" ] && sed -i 's/^VERSION=["0-9].*/VERSION="$(VERSION)"/' $(DESTDIR)$(TAZPANEL)/installer.cgi
 	@echo "Installing installer.menu into $(DESTDIR)$(TAZPANEL)/menu.d..."
 	ln -s ../installer.cgi $(DESTDIR)$(TAZPANEL)/menu.d/installer.cgi
 	@echo "Installing config file into $(DESTDIR)/etc/slitaz..."
diff -r 81e51336083b -r 0df59f69c90c installer.cgi
--- a/installer.cgi	Fri Oct 17 18:00:21 2014 +0200
+++ b/installer.cgi	Sat Dec 06 10:13:14 2014 +0100
@@ -11,7 +11,7 @@
 # restricted path
 PATH="/usr/sbin:/usr/bin:/sbin:/bin"
 
-VERSION=3.95
+VERSION=3.96
 
 # Common functions from libtazpanel
 . lib/libtazpanel
diff -r 81e51336083b -r 0df59f69c90c slitaz-installer
--- a/slitaz-installer	Fri Oct 17 18:00:21 2014 +0200
+++ b/slitaz-installer	Sat Dec 06 10:13:14 2014 +0100
@@ -12,7 +12,7 @@
 TAZINST_REQUIRED_VERSION="2.98"
 BACKLIST="SliTaz GNU/Linux installer"
 DIALOG=dialog
-VERSION="3.95"
+VERSION="3.96"
 
 #--------------
 # msgs section
diff -r 81e51336083b -r 0df59f69c90c tazinst
--- a/tazinst	Fri Oct 17 18:00:21 2014 +0200
+++ b/tazinst	Sat Dec 06 10:13:14 2014 +0100
@@ -1814,7 +1814,8 @@
 		log "$(gettext "Kernel name not found, falling back to:") $(uname -r)"
 	fi
 	mkdir -p $TARGET_ROOT/boot || error8
-	cp $SOURCE_ROOT/boot/bzImage $TARGET_ROOT/boot/$KERNEL
+	cp $SOURCE_ROOT/boot/bzImage $TARGET_ROOT/boot/$KERNEL 2> /dev/null ||
+	cp $SOURCE_ROOT/boot/bzImage* $TARGET_ROOT/boot/$KERNEL
 	log "$(gettext "install_kernel:") $KERNEL"
 }