[Lunar-commits] CVS: lunar-iso Makefile,1.13,1.14

[Auke Kok]

Update of /var/cvs/lunar/lunar-iso
In directory espresso.foo-projects.org:/tmp/cvs-serv27184

Modified Files:
	Makefile 
Log Message:
Merginf in nestu's kernel-version related code, as well as some fixes and small additions to the build code


Index: Makefile
===================================================================
RCS file: /var/cvs/lunar/lunar-iso/Makefile,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- Makefile	20 Mar 2005 15:22:22 -0000	1.13
+++ Makefile	27 Mar 2005 16:49:28 -0000	1.14
@@ -5,15 +5,18 @@
 #
 # all user configurable options are in conf/config
 #
+
 include conf/config
 
+ISO_KSUFFIX = $(shell if echo $(ISO_KVER) | grep -q "^2\.6\." ; then echo 2.6 ; else echo 2.4 ; fi ;)
+
 # need to make this defined during run-time
 ISO_SOURCE = $(shell bash -c "pwd -P")
 
 # define the location where the ISO will be generated
 ISO_TARGET = $(ISO_SOURCE)/BUILD
 
-export ISO_SOURCE ISO_TARGET ISO_VERSION ISO_CODENAME ISO_DATE ISO_CNAME ISO_KVER ISO_PVER ISO_LUNAR_MODULE
+export ISO_SOURCE ISO_TARGET ISO_VERSION ISO_CODENAME ISO_DATE ISO_CNAME ISO_KVER ISO_PVER ISO_LUNAR_MODULE ISO_KSUFFIX
 
 all: iso
 
@@ -101,6 +104,8 @@
 	rm -f template/moonbase.tar.bz2
 	rm -f discover/discover
 	rm -f memtest/memtest
+	rm -f kernels/linux kernels/linux.map
+	rm -f kernels/safe kernels/safe.map
 
 blank:
 	@scripts/blank