summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.in4
-rw-r--r--Rules.mak6
-rw-r--r--extra/Configs/Config.in.arch4
-rwxr-xr-xextra/scripts/gen_bits_syscall_h.sh2
4 files changed, 8 insertions, 8 deletions
diff --git a/Makefile.in b/Makefile.in
index 020cd32fc..80c426c8e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -90,7 +90,7 @@ headers: include/bits/uClibc_config.h
cd $(top_builddir); \
tmp=`mktemp include/bits/sysnum.h.XXXXXX 2>/dev/null`; \
[ -z "$$tmp" ] && tmp='include/bits/sysnum.h.new'; \
- KERNEL_SOURCE="${KERNEL_SOURCE}" top_builddir=. CC="$(CC) $(CPU_CFLAGS)" $(SHELL) extra/scripts/gen_bits_syscall_h.sh > $$tmp; \
+ KERNEL_HEADERS="${KERNEL_HEADERS}" top_builddir=. CC="$(CC) $(CPU_CFLAGS)" $(SHELL) extra/scripts/gen_bits_syscall_h.sh > $$tmp; \
if cmp include/bits/sysnum.h $$tmp >/dev/null 2>&1; then \
$(RM) $$tmp; \
else \
@@ -111,7 +111,7 @@ RUNTIME_PREFIX_LIB_FROM_DEVEL_PREFIX_LIB=$(shell $(top_srcdir)extra/scripts/rela
install_headers:
$(INSTALL) -d $(PREFIX)$(DEVEL_PREFIX)include
printf ".svn\n.cvsignore\nCVS\n" > tar_exclude ; \
- if [ "$(KERNEL_SOURCE)" = "$(PREFIX)$(DEVEL_PREFIX)" ] ; then \
+ if [ "$(KERNEL_HEADERS)" = "$(PREFIX)$(DEVEL_PREFIX)" ] ; then \
ls -1d include/linux include/asm* >> tar_exclude ; \
fi ; \
$(TAR) -chf - -X tar_exclude include \
diff --git a/Rules.mak b/Rules.mak
index 6822f8ce8..08516e68b 100644
--- a/Rules.mak
+++ b/Rules.mak
@@ -64,8 +64,8 @@ TARGET_ARCH:=$(shell grep -s '^TARGET_ARCH' $(top_builddir)/.config | sed -e 's/
TARGET_ARCH:=$(strip $(subst ",, $(strip $(TARGET_ARCH))))
RUNTIME_PREFIX:=$(strip $(subst //,/, $(subst ,/, $(subst ",, $(strip $(RUNTIME_PREFIX))))))
DEVEL_PREFIX:=$(strip $(subst //,/, $(subst ,/, $(subst ",, $(strip $(DEVEL_PREFIX))))))
-KERNEL_SOURCE:=$(strip $(subst //,/, $(subst ,/, $(subst ",, $(strip $(KERNEL_SOURCE))))))
-export RUNTIME_PREFIX DEVEL_PREFIX KERNEL_SOURCE
+KERNEL_HEADERS:=$(strip $(subst //,/, $(subst ,/, $(subst ",, $(strip $(KERNEL_HEADERS))))))
+export RUNTIME_PREFIX DEVEL_PREFIX KERNEL_HEADERS
# Now config hard core
@@ -471,7 +471,7 @@ else
PTNAME :=
PTINC :=
endif
-CFLAGS += -I$(KERNEL_SOURCE)
+CFLAGS += -I$(KERNEL_HEADERS)
# Sigh, some stupid versions of gcc can't seem to cope with '-iwithprefix include'
#CFLAGS+=-iwithprefix include
diff --git a/extra/Configs/Config.in.arch b/extra/Configs/Config.in.arch
index 6845124c6..a981f7e0a 100644
--- a/extra/Configs/Config.in.arch
+++ b/extra/Configs/Config.in.arch
@@ -154,9 +154,9 @@ config DO_C99_MATH
If your applications require the newer C99 math library functions,
then answer Y.
-config KERNEL_SOURCE
+config KERNEL_HEADERS
string "Linux kernel header location"
- default "/usr/src/linux"
+ default "/usr/src/linux/include"
help
The kernel source you use to compile with should be the same as the
Linux kernel you run your apps on. uClibc doesn't even try to achieve binary
diff --git a/extra/scripts/gen_bits_syscall_h.sh b/extra/scripts/gen_bits_syscall_h.sh
index 0ba444007..116534ab3 100755
--- a/extra/scripts/gen_bits_syscall_h.sh
+++ b/extra/scripts/gen_bits_syscall_h.sh
@@ -14,7 +14,7 @@
#
# Warning!!! This does _no_ error checking!!!
-INCLUDE_OPTS="-nostdinc -I${KERNEL_SOURCE}"
+INCLUDE_OPTS="-nostdinc -I${KERNEL_HEADERS}"
case $CC in
*icc*) CC_SYSNUM_ARGS="-dM" ;;