From fc91a4155d265a189ae6aa50b63640d8da7b3609 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 17 Dec 2010 00:54:50 -0800 Subject: install_headers: Fix the header installation when using out of source build ( O=/x/y/z ) Signed-off-by: Khem Raj --- Makefile.in | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'Makefile.in') diff --git a/Makefile.in b/Makefile.in index 3399f8842..b4dcf6bfd 100644 --- a/Makefile.in +++ b/Makefile.in @@ -291,7 +291,14 @@ endif install_headers: headers $(top_builddir)extra/scripts/unifdef | $(PREFIX)$(DEVEL_PREFIX)include @$(call disp_install,"include -> $(PREFIX)$(DEVEL_PREFIX)include") $(Q)top_builddir=$(top_builddir) \ - $(top_srcdir)extra/scripts/install_headers.sh include $(PREFIX)$(DEVEL_PREFIX)include + $(top_srcdir)extra/scripts/install_headers.sh \ + include $(PREFIX)$(DEVEL_PREFIX)include +ifneq ($(O),) # only run this step in O is set i.e. make O=/my/builddir/ .. + @$(call disp_install,"$(top_builddir)/include -> $(PREFIX)$(DEVEL_PREFIX)include") + $(Q)top_builddir=$(top_builddir) \ + $(top_srcdir)extra/scripts/install_headers.sh \ + $(top_builddir)/include $(PREFIX)$(DEVEL_PREFIX)include +endif $(Q)cd $(PREFIX)$(DEVEL_PREFIX)include && $(RM) -r $(HEADERS_RM-) ifeq ($(UCLIBC_HAS_WCHAR),) $(Q)cd $(PREFIX)$(DEVEL_PREFIX)include && mv -f wchar-stub.h wchar.h -- cgit v1.2.3 From 4d81f2a74578f819285b131c682e8d2f6c315c4e Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 18 Dec 2010 21:51:06 -0800 Subject: Makefile.in: Add header to 'all' target Stage bits/uClibc_ctype.h when locales are enabled Signed-off-by: Khem Raj --- Makefile.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Makefile.in') diff --git a/Makefile.in b/Makefile.in index b4dcf6bfd..d7a5fca60 100644 --- a/Makefile.in +++ b/Makefile.in @@ -23,7 +23,7 @@ export KCONFIG_CONFIG ifeq ($(HAVE_DOT_CONFIG),y) -all: pregen libs +all: headers pregen libs libs: pregen # In this section, we need .config @@ -260,6 +260,7 @@ HEADERS_RM-$(UCLIBC_HAS_WCHAR) += wchar.h wctype.h HEADERS_RM-$(UCLIBC_HAS_WORDEXP) += wordexp.h HEADERS_RM-$(UCLIBC_HAS_XATTR) += sys/xattr.h HEADERS_RM-$(UCLIBC_HAS_XLOCALE) += xlocale.h +HEADERS_RM-$(UCLIBC_HAS_LOCALE) += bits/uClibc_ctype.h HEADERS_RM-$(UCLIBC_LINUX_SPECIFIC) += sys/fsuid.h sys/inotify.h sys/perm.h \ sys/personality.h \ sys/prctl.h \ -- cgit v1.2.3