diff options
| -rw-r--r-- | Makefile.in | 17 | ||||
| -rw-r--r-- | Makerules | 4 |
2 files changed, 15 insertions, 6 deletions
diff --git a/Makefile.in b/Makefile.in index 3dbe7bb7b..d6faec0f5 100644 --- a/Makefile.in +++ b/Makefile.in @@ -288,18 +288,23 @@ HEADERS_RM-$(UCLIBC_SUSV4_LEGACY) += utime.h ### ucontext.h ifneq ($(findstring install,$(MAKECMDGOALS)),) -$(PREFIX)$(RUNTIME_PREFIX)$(MULTILIB_DIR) $(addprefix $(PREFIX)$(DEVEL_PREFIX),include lib): +$(addprefix $(PREFIX)$(DEVEL_PREFIX),include lib): + $(do_mkdir) +# avoid warning about duplicate targets in rule or overrides +ifneq ($(abspath $(RUNTIME_PREFIX)$(MULTILIB_DIR)),$(abspath $(DEVEL_PREFIX)lib)) +$(PREFIX)$(RUNTIME_PREFIX)$(MULTILIB_DIR): $(do_mkdir) endif - +endif install_headers: headers $(top_builddir)extra/scripts/unifdef | $(PREFIX)$(DEVEL_PREFIX)include - top_builddir=$(top_builddir) \ + @$(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 - cd $(PREFIX)$(DEVEL_PREFIX)include && $(RM) -r $(HEADERS_RM-) + $(Q)cd $(PREFIX)$(DEVEL_PREFIX)include && $(RM) -r $(HEADERS_RM-) ifeq ($(UCLIBC_HAS_WCHAR),) - cd $(PREFIX)$(DEVEL_PREFIX)include && mv -f wchar-stub.h wchar.h + $(Q)cd $(PREFIX)$(DEVEL_PREFIX)include && mv -f wchar-stub.h wchar.h else - cd $(PREFIX)$(DEVEL_PREFIX)include && $(RM) -f wchar-stub.h + $(Q)cd $(PREFIX)$(DEVEL_PREFIX)include && $(RM) -f wchar-stub.h endif # Installs development library links. @@ -95,6 +95,7 @@ pur_disp_ld = echo " "LD $(1) pur_disp_ln = echo " "LN $(show_objs) pur_disp_mkdir = echo " "MKDIR $(show_objs) pur_disp_gen = echo " "GEN $(show_objs) +pur_disp_install = echo " "INSTALL $(1) pur_disp_unifdef = echo " "UNIFDEF $(show_objs) pur_disp_rm = echo " "CLEAN $(subst CLEAN_,,$(patsubst HEADERCLEAN_%,include \(%\),$@)) @@ -115,6 +116,7 @@ sil_disp_ld = true sil_disp_ln = true sil_disp_mkdir = true sil_disp_gen = true +sil_disp_install = true sil_disp_unifdef = true sil_disp_rm = true @@ -135,6 +137,7 @@ ver_disp_ld = ver_disp_ln = ver_disp_mkdir = ver_disp_gen = +ver_disp_install = ver_disp_unifdef = echo $(cmd_unifdef) ver_disp_rm = @@ -155,6 +158,7 @@ disp_ld = $($(DISP)_disp_ld) disp_ln = $($(DISP)_disp_ln) disp_mkdir = $($(DISP)_disp_mkdir) disp_gen = $($(DISP)_disp_gen) +disp_install = $($(DISP)_disp_install) disp_unifdef = $($(DISP)_disp_unifdef) disp_rm = $($(DISP)_disp_rm) |