rpms/kernel/F-11 Makefile,1.104,1.105

[Dave Jones]

Author: davej

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2013/F-11

Modified Files:
	Makefile 
Log Message:
Fix up 'make reconfig'.

devel is still borked, but this change will at least make it work after F13
is branched.  It needs some smarts to use the 'next' version number when
we're in -rc stage.



Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/Makefile,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -p -r1.104 -r1.105
--- Makefile	24 Sep 2009 16:16:35 -0000	1.104
+++ Makefile	14 Oct 2009 00:12:12 -0000	1.105
@@ -32,6 +32,12 @@ endif
 include $(MAKEFILE_COMMON)
 include Makefile.config
 
+ifndef KVERSION
+KVERSION := $(shell awk '$$1 == "%define" && $$2 == "base_sublevel" { \
+				print "2.6." $$3 \
+			 }' $(SPECFILE))
+endif
+
 extremedebug:
 	@perl -pi -e 's/# CONFIG_DEBUG_PAGEALLOC is not set/CONFIG_DEBUG_PAGEALLOC=y/' config-nodebug
 
@@ -130,7 +136,7 @@ rhel:
 
 reconfig:
 	@rm -f kernel-*-config
-	@VERSION="2.6.29" make -f Makefile.config configs
+	@VERSION=$(KVERSION) make -f Makefile.config configs
 	@scripts/reconfig.sh
 
 force-tag: $(SPECFILE) $(COMMON_DIR)/branches
@@ -173,12 +179,6 @@ srpm beehive-sprm: RELEASE := 0.$(varian
 endif
 endif
 
-ifndef KVERSION
-KVERSION := $(shell awk '$$1 == "%define" && $$2 == "base_sublevel" { \
-				print "2.6." $$3 \
-			 }' $(SPECFILE))
-endif
-
 #
 # Hacks for building kernel rpms from upstream code plus local GIT branches.
 # Use "make git/BRANCH/TARGET" like "make TARGET".