OSDN Git Service

install_headers: Fix the header installation when using out of source
authorKhem Raj <raj.khem@gmail.com>
Fri, 17 Dec 2010 08:54:50 +0000 (00:54 -0800)
committerKhem Raj <raj.khem@gmail.com>
Sat, 18 Dec 2010 16:05:34 +0000 (08:05 -0800)
build ( O=/x/y/z )

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Makefile.in

index 3399f88..b4dcf6b 100644 (file)
@@ -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