From patchwork Tue Dec 14 16:39:44 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Ben Gardiner <bengardiner@nanometrics.ca>
X-Patchwork-Id: 410621
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oBEGe9V4004494
	for <patchwork-kbuild@patchwork.kernel.org>;
	Tue, 14 Dec 2010 16:40:09 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1759480Ab0LNQkH (ORCPT
	<rfc822;patchwork-kbuild@patchwork.kernel.org>);
	Tue, 14 Dec 2010 11:40:07 -0500
Received: from na3sys009aog114.obsmtp.com ([74.125.149.211]:49485 "HELO
	na3sys009aog114.obsmtp.com" rhost-flags-OK-OK-OK-OK)
	by vger.kernel.org with SMTP id S1758230Ab0LNQkG (ORCPT
	<rfc822;linux-kbuild@vger.kernel.org>);
	Tue, 14 Dec 2010 11:40:06 -0500
Received: from source ([209.85.160.170]) by na3sys009aob114.postini.com
	([74.125.148.12]) with SMTP
	ID DSNKTQed5gGaFpFNeGtVS5TiWbn4sdwZouuz@postini.com;
	Tue, 14 Dec 2010 08:40:06 PST
Received: by mail-gy0-f170.google.com with SMTP id 2so430167gyf.1
	for <multiple recipients>; Tue, 14 Dec 2010 08:40:06 -0800 (PST)
Received: by 10.236.108.131 with SMTP id q3mr7181914yhg.85.1292344805914;
	Tue, 14 Dec 2010 08:40:05 -0800 (PST)
Received: from localhost.localdomain ([206.191.47.130])
	by mx.google.com with ESMTPS id v18sm68520yhg.15.2010.12.14.08.40.04
	(version=TLSv1/SSLv3 cipher=RC4-MD5);
	Tue, 14 Dec 2010 08:40:05 -0800 (PST)
From: Ben Gardiner <bengardiner@nanometrics.ca>
To: Michal Marek <mmarek@suse.cz>, Roman Zippel <zippel@linux-m68k.org>
Cc: linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org,
	Roman Zippel <zippel@linux-m68k.org>, Michal Marek <mmarek@suse.cz>
Subject: [PATCH v2] kbuild: fix interaction of CONFIG_IKCONFIG and
	KCONFIG_CONFIG
Date: Tue, 14 Dec 2010 11:39:44 -0500
Message-Id: 
 <98706bc370fe92e090b16c7ad91dce1cd2203acf.1292344590.git.bengardiner@nanometrics.ca>
X-Mailer: git-send-email 1.7.0.4
In-Reply-To: <4D078D53.4040700@suse.cz>
References: <4D078D53.4040700@suse.cz>
Sender: linux-kbuild-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kbuild.vger.kernel.org>
X-Mailing-List: linux-kbuild@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]);
	Tue, 14 Dec 2010 16:40:09 +0000 (UTC)


diff --git a/Makefile b/Makefile
index 3d94974..e0973cc 100644
--- a/Makefile
+++ b/Makefile
@@ -224,6 +224,7 @@ ifeq ($(ARCH),m68knommu)
 endif
 
 KCONFIG_CONFIG	?= .config
+export KCONFIG_CONFIG
 
 # SHELL used by kbuild
 CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
diff --git a/kernel/Makefile b/kernel/Makefile
index 0b5ff08..33e0a39 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -121,7 +121,7 @@ $(obj)/configs.o: $(obj)/config_data.h
 # config_data.h contains the same information as ikconfig.h but gzipped.
 # Info from config_data can be extracted from /proc/config*
 targets += config_data.gz
-$(obj)/config_data.gz: .config FORCE
+$(obj)/config_data.gz: $(KCONFIG_CONFIG) FORCE
 	$(call if_changed,gzip)
 
 quiet_cmd_ikconfiggz = IKCFG   $@