[git commit] buildsys: fix make V=2 install

Bernhard Reutner-Fischer rep.dot.nop at gmail.com
Fri Oct 5 10:53:31 UTC 2018


commit: https://git.uclibc.org/uClibc++/commit/?id=e70370f315a7a91c5e3ecf8387a1a4ef35fed691
branch: https://git.uclibc.org/uClibc++/commit/?id=refs/heads/master

need to call disp_install, not just expand it..

Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop at gmail.com>
---
 bin/Makefile.in     | 2 +-
 include/Makefile.in | 2 +-
 src/Makefile.in     | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bin/Makefile.in b/bin/Makefile.in
index 8e1b50c..8d11316 100644
--- a/bin/Makefile.in
+++ b/bin/Makefile.in
@@ -3,7 +3,7 @@ CLEAN_bin:
 	$(do_rm) $(WRAPPER) $(BIN_DIR)env_check
 
 install-bin: $(WRAPPER) | $(DESTDIR)$(UCLIBCXX_RUNTIME_BINDIR)
-	@$(disp_install) $(call dirify,$(WRAPPER))
+	@$(call disp_install,$(call dirify,$(WRAPPER)))
 	$(Q)$(INSTALL) -m 0755 $(WRAPPER) $(DESTDIR)$(UCLIBCXX_RUNTIME_BINDIR)
 
 # Rebuild wrapper whenever any of these vars change
diff --git a/include/Makefile.in b/include/Makefile.in
index 45b66c5..0b55cf9 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -3,5 +3,5 @@ DISTCLEAN_include:
 
 headers-y = $(filter-out .svn bits CVS Makefile Makefile.in,$(notdir $(wildcard $(top_srcdir)include/*)))
 install-include: | $(DESTDIR)$(UCLIBCXX_RUNTIME_INCLUDEDIR)
-	@$(disp_install) include/
+	@$(call disp_install, include/)
 	$(Q)$(INSTALL) -m 0644 $(addprefix $(top_srcdir)include/, $(headers-y)) $(DESTDIR)$(UCLIBCXX_RUNTIME_INCLUDEDIR)
diff --git a/src/Makefile.in b/src/Makefile.in
index d3071c3..eee3b4b 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -23,9 +23,9 @@ include $(top_srcdir)src/abi/libgcc_eh/Makefile.in
 include $(top_srcdir)src/abi/libsupc/Makefile.in
 
 install-lib: lib | $(DESTDIR)$(UCLIBCXX_RUNTIME_LIBDIR)
-	@$(if $(BUILD_STATIC_LIB),$(disp_install) $(LIBNAME).a)
-	@$(if $(BUILD_ONLY_STATIC_LIB),,$(disp_install) \
-			$(SHARED_FULLNAME) $(SHARED_MAJORNAME) $(LIBNAME).so)
+	@$(if $(BUILD_STATIC_LIB),$(call disp_install, $(LIBNAME).a))
+	@$(if $(BUILD_ONLY_STATIC_LIB),,$(call disp_install, \
+			$(SHARED_FULLNAME) $(SHARED_MAJORNAME) $(LIBNAME).so))
 	$(Q)(cd $(SRC_OUT); \
 	 $(TAR) -cf - \
 	 $(if $(BUILD_STATIC_LIB),$(LIBNAME).a,) \


More information about the uClibc-cvs mailing list