Since bash is used for all submake processes, it isn't necessary to override Host/Compile and Host/Install to explicitly set SHELL=bash.
Using the default Host/Install also allows their files to be automatically tracked and uninstalled. Signed-off-by: Jeffery To <[email protected]> --- tools/autoconf/Makefile | 13 ------------- tools/quilt/Makefile | 13 ++----------- 2 files changed, 2 insertions(+), 24 deletions(-) diff --git a/tools/autoconf/Makefile b/tools/autoconf/Makefile index 6eb64d77d5..671564337f 100644 --- a/tools/autoconf/Makefile +++ b/tools/autoconf/Makefile @@ -21,17 +21,4 @@ HOST_CONFIGURE_ARGS += \ HOST_CONFIGURE_VARS += \ PERL="/usr/bin/env perl" -define Host/Compile - export SHELL="$(BASH)"; $(MAKE) -C $(HOST_BUILD_DIR) -endef - -define Host/Install - export SHELL="$(BASH)"; $(MAKE) -C $(HOST_BUILD_DIR) install -endef - -define Host/Clean - -export SHELL="$(BASH)"; $(MAKE) -C $(HOST_BUILD_DIR) uninstall - $(call Host/Clean/Default) -endef - $(eval $(call HostBuild)) diff --git a/tools/quilt/Makefile b/tools/quilt/Makefile index d0532b5984..e8f1a7a05f 100644 --- a/tools/quilt/Makefile +++ b/tools/quilt/Makefile @@ -21,16 +21,7 @@ define Host/Configure [ -f $(HOST_BUILD_DIR)/Makefile ] endef -define Host/Compile - $(MAKE) -C $(HOST_BUILD_DIR) SHELL="$(BASH)" all -endef - -define Host/Install - $(MAKE) -C $(HOST_BUILD_DIR) SHELL="$(BASH)" install -endef - -define Host/Clean - rm -f $(STAGING_DIR_HOST)/bin/quilt -endef +HOST_MAKE_INSTALL_FLAGS += \ + BUILD_ROOT="$(HOST_INSTALL_DIR)" $(eval $(call HostBuild)) -- 2.20.1 _______________________________________________ openwrt-devel mailing list [email protected] https://lists.openwrt.org/mailman/listinfo/openwrt-devel
