aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2006-10-27 09:05:40 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2006-10-27 09:05:40 +0000
commitb54b208d90e1ad7d338f3c3478e8ad7443a2c356 (patch)
tree646ea05dd1aa204eb9765ef90cfc351f749db5ac /Makefile
parentdca0b707c0f0998670f8e69600cc30d94e9b217b (diff)
downloadbusybox-w32-b54b208d90e1ad7d338f3c3478e8ad7443a2c356.tar.gz
busybox-w32-b54b208d90e1ad7d338f3c3478e8ad7443a2c356.tar.bz2
busybox-w32-b54b208d90e1ad7d338f3c3478e8ad7443a2c356.zip
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 @@
1VERSION = 1 1VERSION = 1
2PATCHLEVEL = 2 2PATCHLEVEL = 2
3SUBLEVEL = 1 3SUBLEVEL = 2
4EXTRAVERSION = .svn 4EXTRAVERSION = .svn
5NAME = Unnamed 5NAME = Unnamed
6 6
@@ -302,7 +302,6 @@ AFLAGS_KERNEL =
302CFLAGS := 302CFLAGS :=
303CPPFLAGS := 303CPPFLAGS :=
304AFLAGS := 304AFLAGS :=
305include $(srctree)/Makefile.flags
306 305
307# Read KERNELRELEASE from .kernelrelease (if it exists) 306# Read KERNELRELEASE from .kernelrelease (if it exists)
308KERNELRELEASE = $(shell cat .kernelrelease 2> /dev/null) 307KERNELRELEASE = $(shell cat .kernelrelease 2> /dev/null)
@@ -467,6 +466,9 @@ ifeq ($(dot-config),1)
467# To avoid any implicit rule to kick in, define an empty command 466# To avoid any implicit rule to kick in, define an empty command
468.config .kconfig.d: ; 467.config .kconfig.d: ;
469 468
469# Now we can define CFLAGS etc according to .config
470include $(srctree)/Makefile.flags
471
470# If .config is newer than include/autoconf.h, someone tinkered 472# If .config is newer than include/autoconf.h, someone tinkered
471# with it and forgot to run make oldconfig. 473# with it and forgot to run make oldconfig.
472# If kconfig.d is missing then we are probarly in a cleaned tree so 474# If kconfig.d is missing then we are probarly in a cleaned tree so