diff options
| author | Denis Vlasenko | 2006-10-27 09:05:40 +0000 |
|---|---|---|
| committer | Denis Vlasenko | 2006-10-27 09:05:40 +0000 |
| commit | b54b208d90e1ad7d338f3c3478e8ad7443a2c356 (patch) | |
| tree | 646ea05dd1aa204eb9765ef90cfc351f749db5ac | |
| parent | dca0b707c0f0998670f8e69600cc30d94e9b217b (diff) | |
| download | busybox-b54b208d90e1ad7d338f3c3478e8ad7443a2c356.zip busybox-b54b208d90e1ad7d338f3c3478e8ad7443a2c356.tar.gz | |
Fix largefile breakage; advance version to 1.2.2
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | editors/awk.c | 3 |
2 files changed, 5 insertions, 4 deletions
@@ -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 diff --git a/editors/awk.c b/editors/awk.c index b776dd7..9386f4e 100644 --- a/editors/awk.c +++ b/editors/awk.c @@ -2151,7 +2151,7 @@ static var *evaluate(node *op, var *res) L.v = evaluate(nextarg(&op1), v1); if (L.v->type & VF_NUMBER) { fmt_num(buf, MAXVARFMT, getvar_s(V[OFMT]), - getvar_i(L.v), TRUE); + getvar_i(L.v), TRUE); fputs(buf, X.F); } else { fputs(getvar_s(L.v), X.F); @@ -2767,4 +2767,3 @@ keep_going: return 0; } - |