aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorGravatar Denis Vlasenko <vda.linux@googlemail.com>2006-10-27 09:05:40 +0000
committerGravatar Denis Vlasenko <vda.linux@googlemail.com>2006-10-27 09:05:40 +0000
commitb54b208d90e1ad7d338f3c3478e8ad7443a2c356 (patch)
tree646ea05dd1aa204eb9765ef90cfc351f749db5ac /Makefile
parentdca0b707c0f0998670f8e69600cc30d94e9b217b (diff)
downloadbusybox-b54b208d90e1ad7d338f3c3478e8ad7443a2c356.tar.gz
busybox-b54b208d90e1ad7d338f3c3478e8ad7443a2c356.tar.bz2
Fix largefile breakage; advance version to 1.2.2
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 10392a056..9bc94cd0a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
VERSION = 1
PATCHLEVEL = 2
-SUBLEVEL = 1
+SUBLEVEL = 2
EXTRAVERSION = .svn
NAME = Unnamed
@@ -302,7 +302,6 @@ AFLAGS_KERNEL =
CFLAGS :=
CPPFLAGS :=
AFLAGS :=
-include $(srctree)/Makefile.flags
# Read KERNELRELEASE from .kernelrelease (if it exists)
KERNELRELEASE = $(shell cat .kernelrelease 2> /dev/null)
@@ -467,6 +466,9 @@ ifeq ($(dot-config),1)
# To avoid any implicit rule to kick in, define an empty command
.config .kconfig.d: ;
+# Now we can define CFLAGS etc according to .config
+include $(srctree)/Makefile.flags
+
# If .config is newer than include/autoconf.h, someone tinkered
# with it and forgot to run make oldconfig.
# If kconfig.d is missing then we are probarly in a cleaned tree so