diff options
| author | Matthias Schiffer <mschiffer@universe-factory.net> | 2017-01-10 18:43:57 +0100 |
|---|---|---|
| committer | Matthias Schiffer <mschiffer@universe-factory.net> | 2017-01-10 22:15:37 +0100 |
| commit | 77beaf2ec91bba0a0202ea63877ed3b399effabf (patch) | |
| tree | cf7f16585546f96a575a1e4630ddd963dcc1f623 /package/utils | |
| parent | 7480d3309cbe40378da48c3b6decc4ba2b1fc3d5 (diff) | |
| download | openwrt-77beaf2ec91bba0a0202ea63877ed3b399effabf.tar.gz openwrt-77beaf2ec91bba0a0202ea63877ed3b399effabf.tar.bz2 openwrt-77beaf2ec91bba0a0202ea63877ed3b399effabf.zip | |
package: replace $(STAGING_DIR)/host with $(STAGING_DIR_HOSTPKG)
Cleanup to prepare for changing STAGING_DIR_HOSTPKG. The actual change of
STAGING_DIR_HOSTPKG (i.e., moving the host packages back into a common, not
target-specific directory) will be done after the first LEDE release, but
the cleanup will also be useful for projects like Gluon.
Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
Diffstat (limited to 'package/utils')
| -rw-r--r-- | package/utils/bsdiff/Makefile | 6 | ||||
| -rw-r--r-- | package/utils/bzip2/Makefile | 6 | ||||
| -rw-r--r-- | package/utils/lua/Makefile | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/package/utils/bsdiff/Makefile b/package/utils/bsdiff/Makefile index 067eba0cb7..8589e77eae 100644 --- a/package/utils/bsdiff/Makefile +++ b/package/utils/bsdiff/Makefile @@ -59,8 +59,8 @@ define Package/bspatch/install endef define Host/Install - $(INSTALL_DIR) $(STAGING_DIR)/host/bin/ - $(MAKE) -C $(HOST_BUILD_DIR) PREFIX=$(STAGING_DIR)/host/ install + $(INSTALL_DIR) $(STAGING_DIR_HOSTPKG)/bin/ + $(MAKE) -C $(HOST_BUILD_DIR) PREFIX=$(STAGING_DIR_HOSTPKG)/ install endef define Host/Compile @@ -70,7 +70,7 @@ define Host/Compile endef define Host/Install - $(INSTALL_BIN) $(HOST_BUILD_DIR)/bsdiff $(STAGING_DIR)/host/bin/ + $(INSTALL_BIN) $(HOST_BUILD_DIR)/bsdiff $(STAGING_DIR_HOSTPKG)/bin/ endef $(eval $(call HostBuild)) diff --git a/package/utils/bzip2/Makefile b/package/utils/bzip2/Makefile index 3f2de455e5..c17dee136b 100644 --- a/package/utils/bzip2/Makefile +++ b/package/utils/bzip2/Makefile @@ -93,11 +93,11 @@ HOST_MAKE_FLAGS+= \ all HOST_CONFIGURE_ARGS+= \ - --prefix=$(STAGING_DIR)/host + --prefix=$(STAGING_DIR_HOSTPKG) define Host/Install - $(INSTALL_DIR) $(STAGING_DIR)/host/bin/ - $(MAKE) -C $(HOST_BUILD_DIR) PREFIX=$(STAGING_DIR)/host/ install + $(INSTALL_DIR) $(STAGING_DIR_HOSTPKG)/bin/ + $(MAKE) -C $(HOST_BUILD_DIR) PREFIX=$(STAGING_DIR_HOSTPKG)/ install endef $(eval $(call HostBuild)) diff --git a/package/utils/lua/Makefile b/package/utils/lua/Makefile index 29de1ccd96..89b6a87117 100644 --- a/package/utils/lua/Makefile +++ b/package/utils/lua/Makefile @@ -111,7 +111,7 @@ define Build/Compile endef define Host/Configure - $(SED) 's,"/usr/local/","$(STAGING_DIR)/host/",' $(HOST_BUILD_DIR)/src/luaconf.h + $(SED) 's,"/usr/local/","$(STAGING_DIR_HOSTPKG)/",' $(HOST_BUILD_DIR)/src/luaconf.h endef ifeq ($(HOST_OS),Darwin) @@ -132,7 +132,7 @@ endef define Host/Install $(MAKE) -C $(HOST_BUILD_DIR) \ - INSTALL_TOP="$(STAGING_DIR)/host" \ + INSTALL_TOP="$(STAGING_DIR_HOSTPKG)" \ install endef |