浏览代码

tools/coreutils: rename list of installed programs

Rename the list of programs installed by coreutils
to PKG_PROGRAMS, which will create a stampfile for each
through a new feature in host-build.mk.

Also, cleanup a bit to save lines
regarding the usage of this list.

Signed-off-by: Michael Pratt <[email protected]>
Michael Pratt 2 年之前
父节点
当前提交
14a85d929b
共有 1 个文件被更改,包括 4 次插入6 次删除
  1. 4 6
      tools/coreutils/Makefile

+ 4 - 6
tools/coreutils/Makefile

@@ -16,20 +16,18 @@ PKG_HASH:=adbcfcfe899235b71e8768dcf07cd532520b7f54f9a8064843f8d199a904bbaa
 
 
 HOST_BUILD_PARALLEL := 1
 HOST_BUILD_PARALLEL := 1
 
 
-BUILD_PROGRAMS = date readlink touch ln chown ginstall
+PKG_PROGRAMS:=date readlink touch ln chown ginstall
 
 
 include $(INCLUDE_DIR)/host-build.mk
 include $(INCLUDE_DIR)/host-build.mk
 
 
 export GNULIB_SRCDIR:=$(HOST_GNULIB_SRCDIR)
 export GNULIB_SRCDIR:=$(HOST_GNULIB_SRCDIR)
 
 
-BUILD_BINS = $(patsubst %,src/%,$(BUILD_PROGRAMS))
-
 HOST_CONFIGURE_ARGS += \
 HOST_CONFIGURE_ARGS += \
-	 --enable-install-program=$(subst $(space),$(comma),$(strip $(BUILD_PROGRAMS)))
+	 --enable-install-program=$(subst $(space),$(comma),$(strip $(PKG_PROGRAMS)))
 
 
 HOST_MAKE_FLAGS += \
 HOST_MAKE_FLAGS += \
 	$(AM_TOOL_PATHS_FAKE) \
 	$(AM_TOOL_PATHS_FAKE) \
-	PROGRAMS="$(BUILD_BINS)" \
+	PROGRAMS="$(patsubst %,src/%,$(PKG_PROGRAMS))" \
 	LIBRARIES= MANS= SUBDIRS=.
 	LIBRARIES= MANS= SUBDIRS=.
 
 
 define Host/Bootstrap
 define Host/Bootstrap
@@ -58,7 +56,7 @@ endef
 
 
 define Host/Install
 define Host/Install
 	$(INSTALL_DIR) $(1)/bin
 	$(INSTALL_DIR) $(1)/bin
-	$(INSTALL_BIN) $(patsubst %,$(HOST_BUILD_DIR)/%,$(BUILD_BINS)) $(1)/bin/
+	$(INSTALL_BIN) $(patsubst %,$(HOST_BUILD_DIR)/src/%,$(PKG_PROGRAMS)) $(1)/bin/
 	ln -sf ginstall $(1)/bin/install
 	ln -sf ginstall $(1)/bin/install
 endef
 endef