diff options
| author | vda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2006-10-27 09:05:40 +0000 |
|---|---|---|
| committer | vda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2006-10-27 09:05:40 +0000 |
| commit | b02bc331a778460854fd78693174e61192e36a22 (patch) | |
| tree | 646ea05dd1aa204eb9765ef90cfc351f749db5ac | |
| parent | e7c6f0b4c27e36a1331ae7310bfa0549ead33849 (diff) | |
| download | busybox-w32-b02bc331a778460854fd78693174e61192e36a22.tar.gz busybox-w32-b02bc331a778460854fd78693174e61192e36a22.tar.bz2 busybox-w32-b02bc331a778460854fd78693174e61192e36a22.zip | |
Fix largefile breakage; advance version to 1.2.2
git-svn-id: svn://busybox.net/trunk/busybox@16454 69ca8d6d-28ef-0310-b511-8ec308f3f277
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | editors/awk.c | 3 |
2 files changed, 5 insertions, 4 deletions
| @@ -1,6 +1,6 @@ | |||
| 1 | VERSION = 1 | 1 | VERSION = 1 |
| 2 | PATCHLEVEL = 2 | 2 | PATCHLEVEL = 2 |
| 3 | SUBLEVEL = 1 | 3 | SUBLEVEL = 2 |
| 4 | EXTRAVERSION = .svn | 4 | EXTRAVERSION = .svn |
| 5 | NAME = Unnamed | 5 | NAME = Unnamed |
| 6 | 6 | ||
| @@ -302,7 +302,6 @@ AFLAGS_KERNEL = | |||
| 302 | CFLAGS := | 302 | CFLAGS := |
| 303 | CPPFLAGS := | 303 | CPPFLAGS := |
| 304 | AFLAGS := | 304 | AFLAGS := |
| 305 | include $(srctree)/Makefile.flags | ||
| 306 | 305 | ||
| 307 | # Read KERNELRELEASE from .kernelrelease (if it exists) | 306 | # Read KERNELRELEASE from .kernelrelease (if it exists) |
| 308 | KERNELRELEASE = $(shell cat .kernelrelease 2> /dev/null) | 307 | KERNELRELEASE = $(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 | ||
| 470 | include $(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 |
diff --git a/editors/awk.c b/editors/awk.c index b776dd796..9386f4ec0 100644 --- a/editors/awk.c +++ b/editors/awk.c | |||
| @@ -2151,7 +2151,7 @@ static var *evaluate(node *op, var *res) | |||
| 2151 | L.v = evaluate(nextarg(&op1), v1); | 2151 | L.v = evaluate(nextarg(&op1), v1); |
| 2152 | if (L.v->type & VF_NUMBER) { | 2152 | if (L.v->type & VF_NUMBER) { |
| 2153 | fmt_num(buf, MAXVARFMT, getvar_s(V[OFMT]), | 2153 | fmt_num(buf, MAXVARFMT, getvar_s(V[OFMT]), |
| 2154 | getvar_i(L.v), TRUE); | 2154 | getvar_i(L.v), TRUE); |
| 2155 | fputs(buf, X.F); | 2155 | fputs(buf, X.F); |
| 2156 | } else { | 2156 | } else { |
| 2157 | fputs(getvar_s(L.v), X.F); | 2157 | fputs(getvar_s(L.v), X.F); |
| @@ -2767,4 +2767,3 @@ keep_going: | |||
| 2767 | 2767 | ||
| 2768 | return 0; | 2768 | return 0; |
| 2769 | } | 2769 | } |
| 2770 | |||