summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.in2
-rw-r--r--extra/config/README.uClibc2
-rw-r--r--extra/config/confdata.c2
-rw-r--r--extra/config/kconfig-to-uclibc.patch2
-rwxr-xr-xextra/scripts/conf-header.sh (renamed from extra/config/conf-header.sh)0
5 files changed, 5 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in
index a04e46256..f42a3927d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -39,6 +39,8 @@ include $(top_srcdir)libc/Makefile.in
include/bits/uClibc_config.h: extra/config/conf .config
$(Q)$(INSTALL) -d $(dir $@)
$(Q)@$< -o $(top_srcdir)extra/Configs/Config.in
+ $(top_srcdir)extra/scripts/conf-header.sh .config > include/bits/uClibc_config.h
+
# For the moment, we have to keep re-running this target
# because the fix includes scripts rely on pre-processers
diff --git a/extra/config/README.uClibc b/extra/config/README.uClibc
index a20d89963..a616b190b 100644
--- a/extra/config/README.uClibc
+++ b/extra/config/README.uClibc
@@ -6,7 +6,7 @@ To update:
cp /usr/src/linux/Documentation/kbuild/kconfig-language.txt .
mv Makefile Makefile.kconfig
patch -p1 < ../config/kconfig-to-uclibc.patch
- cp ../config/conf-header.sh ../config/README.uClibc .
+ cp ../config/README.uClibc .
cd ..
rm -rf config
mv config.new config
diff --git a/extra/config/confdata.c b/extra/config/confdata.c
index 0dbd14152..64af1ac82 100644
--- a/extra/config/confdata.c
+++ b/extra/config/confdata.c
@@ -649,7 +649,7 @@ int conf_write_autoconf(void)
time_t now;
int i, l;
- return system("./extra/config/conf-header.sh .config > include/bits/uClibc_config.h");
+ return 0;
sym_clear_all_valid();
diff --git a/extra/config/kconfig-to-uclibc.patch b/extra/config/kconfig-to-uclibc.patch
index 78921ec11..f8382882f 100644
--- a/extra/config/kconfig-to-uclibc.patch
+++ b/extra/config/kconfig-to-uclibc.patch
@@ -172,7 +172,7 @@
time_t now;
int i, l;
-+ return system("./extra/config/conf-header.sh .config > include/bits/uClibc_config.h");
++ return 0;
+
sym_clear_all_valid();
diff --git a/extra/config/conf-header.sh b/extra/scripts/conf-header.sh
index 90dfa999a..90dfa999a 100755
--- a/extra/config/conf-header.sh
+++ b/extra/scripts/conf-header.sh