From 39ca6d50d8d52a9c8cb252cffb23a9d6f0c2942d Mon Sep 17 00:00:00 2001
From: Will Wagner <willw@carallon.com>
Date: Mon, 11 Jan 2010 12:28:50 +0000
Subject: Move config files into output directory for out-of-tree build

Closes #1213

Signed-off-by: Will Wagner <will_wagner@carallon.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/config/confdata.c | 53 +++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 47 insertions(+), 6 deletions(-)

(limited to 'package/config/confdata.c')

diff --git a/package/config/confdata.c b/package/config/confdata.c
index 52199123a..fe1fc2e8e 100644
--- a/package/config/confdata.c
+++ b/package/config/confdata.c
@@ -423,8 +423,17 @@ int conf_write(const char *name)
 				basename = conf_get_configname();
 		} else
 			basename = name;
-	} else
+	} else {
+		char *slash;
+
 		basename = conf_get_configname();
+		if((slash = strrchr(basename, '/'))) {
+			int size = slash - basename + 1;
+			memcpy(dirname, basename, size);
+			dirname[size] = 0;
+			basename = slash + 1;
+		}
+	}
 
 	sprintf(newname, "%s%s", dirname, basename);
 	env = getenv("KCONFIG_OVERWRITECONFIG");
@@ -688,19 +697,51 @@ int conf_write_autoconf(void)
 	FILE *out, *out_h;
 	time_t now;
 	int i, l;
+	char buf[PATH_MAX+1];
+	char buf2[PATH_MAX+1];
 
 	sym_clear_all_valid();
 
-	file_write_dep(".config.cmd");
+	name = conf_get_configname();
+	str = strrchr(name, '/');
+
+	memset(buf, 0, PATH_MAX+1);
+	if(str)
+	{
+		strncpy(buf, name, str - name + 1);
+	}
+	strcat(buf, ".config.cmd");
+	file_write_dep(buf);
+
+	memset(buf, 0, PATH_MAX+1);
+	if(str)
+	{
+		strncpy(buf, name, str - name + 1);
+	}
+	strcat(buf, ".auto.deps");
+	write_make_deps(buf);
 
 	if (conf_split_config())
 		return 1;
 
-	out = fopen(".tmpconfig", "w");
+	memset(buf, 0, PATH_MAX+1);
+	if(str)
+	{
+		strncpy(buf, name, str - name + 1);
+	}
+	strcat(buf, ".tmpconfig");
+	memset(buf2, 0, PATH_MAX+1);
+	if(str)
+	{
+		strncpy(buf2, name, str - name + 1);
+	}
+	strcat(buf2, ".tmpconfig.h");
+
+	out = fopen(buf, "w");
 	if (!out)
 		return 1;
 
-	out_h = fopen(".tmpconfig.h", "w");
+	out_h = fopen(buf2, "w");
 	if (!out_h) {
 		fclose(out);
 		return 1;
@@ -782,14 +823,14 @@ int conf_write_autoconf(void)
 	name = getenv("KCONFIG_AUTOHEADER");
 	if (!name)
 		name = "include/linux/autoconf.h";
-	if (rename(".tmpconfig.h", name))
+	if (rename(buf2, name))
 		return 1;
 	name = conf_get_autoconfig_name();
 	/*
 	 * This must be the last step, kbuild has a dependency on auto.conf
 	 * and this marks the successful completion of the previous steps.
 	 */
-	if (rename(".tmpconfig", name))
+	if (rename(buf, name))
 		return 1;
 
 	return 0;
-- 
cgit v1.2.3