--- config/Make.project.rules.orig 2021-06-21 14:44:58 UTC +++ config/Make.project.rules @@ -43,17 +43,16 @@ component-configs = $(call unique,$(foreach c,$( # # Some variables for utilities # -INSTALL ?= install -p -MV ?= mv -f -RM ?= rm -f -MKDIR ?= mkdir -CHMOD ?= chmod +MV = /bin/mv +RM = /bin/rm -f +MKDIR = /bin/mkdir -p +CHMOD = /bin/chmod Q := $(if $(V),,@) E := $(if $(V),@:,@echo) # $(call install-data,$1=filename,$2=srcdir,$3=destdist) -install-data = $(INSTALL) -m 644 $2/$1 $(DESTDIR)$3/$1 +install-data = %%INSTALL_DATA%% $2/$1 $(DESTDIR)$3/$1 # # $(call install-data-files,$1=files,$2=$srcdir,$3=$destdir,$4=target,$5=text-output) @@ -213,7 +212,7 @@ endef define install-static-library $(DESTDIR)$5/$(call mklibname,$1,$3,$4): $2/$(call mklibname,$1,$3,$4) | $(DESTDIR)$5 $(E) "Installing $$@" - $(Q)$(INSTALL) $$< $(DESTDIR)$5 + $(Q)%%INSTALL_LIB%% $$< $(DESTDIR)$5 endef # $(call get-static-library-targets,$1=libname,$2=libdir,$3=version,$4=soversion,$5=devinstall) @@ -249,8 +248,7 @@ define install-shared-library $(DESTDIR)$5/$(call mkshlibfilename,$1,$3,$4): $2/$(call mkshlibfilename,$1,$3,$4) | $(DESTDIR)$5 $(E) "Installing $$@" - $(Q)$(INSTALL) $$< $(DESTDIR)$5 - $(Q)$(CHMOD) a+rx $$@ + $(Q)%%INSTALL_LIB%% $$< $(DESTDIR)$5 ifneq ($(and $4,$(filter-out undefined,$(origin mksoname))),) $(DESTDIR)$5/$(call mksoname,$1,$3,$4): $(DESTDIR)$5/$(call mkshlibfilename,$1,$3,$4) \ @@ -289,8 +287,7 @@ endef define install-shared-module $(DESTDIR)$5/$1: $2/$1 | $(DESTDIR)$5 $(E) "Installing $$@" - $(Q)$(INSTALL) $$< $(DESTDIR)$5 - $(Q)$(CHMOD) a+rx $$@ + $(Q)%%INSTALL_LIB%% $$< $(DESTDIR)$5 endef # $(call get-shared-module-targets,$1=libname,$2=libdir,$3=version,$4=soversion,$5=devinstall) @@ -314,8 +311,7 @@ endef define install-program $(DESTDIR)$5/$1$(EXE_EXT): $2/$1$(EXE_EXT) | $(DESTDIR)$5 $(E) "Installing $$@" - $(Q)$(INSTALL) $$< $(DESTDIR)$5 - $(Q)$(CHMOD) a+rx $$@ + $(Q)%%INSTALL_PROGRAM%% $$< $(DESTDIR)$5 endef # $(call get-program-targets,$1=exename,$2=bindir,$3=version,$4=soversion,$5=devinstall)