From b02bc331a778460854fd78693174e61192e36a22 Mon Sep 17 00:00:00 2001
From: vda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277>
Date: Fri, 27 Oct 2006 09:05:40 +0000
Subject: Fix largefile breakage; advance version to 1.2.2
git-svn-id: svn://busybox.net/trunk/busybox@16454 69ca8d6d-28ef-0310-b511-8ec308f3f277
---
Makefile | 6 ++++--
editors/awk.c | 3 +--
2 files changed, 5 insertions(+), 4 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
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)
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;
}
-
--
cgit v1.2.3-55-g6feb