generic packages: use $(HOST_DIR) instead of $(HOST_DIR)/usr as prefix

Remove the redundant usr/ component of the HOST_DIR paths. Since a
previous commit added a symlink from $(HOST_DIR)/usr to $(HOST_DIR),
everything keeps on working.

This is a mechanical change with
git grep -l '\$(HOST_DIR)/usr' | xargs sed -i 's%\(prefix\|PREFIX\)=\("\?\)\$(HOST_DIR)/usr%\1=\2$(HOST_DIR)%g'

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/package/acl/acl.mk b/package/acl/acl.mk
index edcf4fd8edd3930b1816dd5019978c3cb1359140..9e57d091311cf4375e38b511b58feed1ad2ce28f 100644 (file)
--- a/package/acl/acl.mk
+++ b/package/acl/acl.mk
@@ -47,8 +47,8 @@ HOST_ACL_DEPENDENCIES = host-attr
 HOST_ACL_CONF_OPTS = --enable-gettext=no
 HOST_ACL_MAKE_ENV = CFLAGS="$(HOST_CFLAGS)"
 HOST_ACL_INSTALL_OPTS = \
-       prefix=$(HOST_DIR)/usr \
-       exec_prefix=$(HOST_DIR)/usr \
+       prefix=$(HOST_DIR) \
+       exec_prefix=$(HOST_DIR) \
        PKG_DEVLIB_DIR=$(HOST_DIR)/usr/lib \
        install-dev install-lib
 # For the host, libacl.la is correct, no fixup needed.

diff --git a/package/acpica/acpica.mk b/package/acpica/acpica.mk
index 8cfe79351092d92c2ad174d910a8beed89b04c4c..57cc37f85eef2282fe6fd1553987310ccf5fca8b 100644 (file)
--- a/package/acpica/acpica.mk
+++ b/package/acpica/acpica.mk
@@ -30,7 +30,7 @@ endef
 
 define HOST_ACPICA_INSTALL_CMDS
        $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) \
-               PREFIX="$(HOST_DIR)/usr" \
+               PREFIX="$(HOST_DIR)" \
                INSTALLFLAGS=-m755 install
 endef
 

diff --git a/package/attr/attr.mk b/package/attr/attr.mk
index 0c85701e07df7e7cd396862c38e28fa40582f5d2..8d250608b7c1bc219ba4b8d59e82a9ec2d11a8fb 100644 (file)
--- a/package/attr/attr.mk
+++ b/package/attr/attr.mk
@@ -28,8 +28,8 @@ ATTR_INSTALL_TARGET_OPTS = \
        install install-lib
 
 HOST_ATTR_INSTALL_OPTS = \
-       prefix=$(HOST_DIR)/usr \
-       exec_prefix=$(HOST_DIR)/usr \
+       prefix=$(HOST_DIR) \
+       exec_prefix=$(HOST_DIR) \
        install-dev install-lib
 
 # The libdir variable in libattr.la is empty, so let's fix it. This is

diff --git a/package/boost/boost.mk b/package/boost/boost.mk
index 874c03fcb6d125935afcb4309fc6675b9f3bc116..3600cdea84c396eb86ca1f1f4424d1b4d943b508 100644 (file)
--- a/package/boost/boost.mk
+++ b/package/boost/boost.mk
@@ -167,14 +167,14 @@ define HOST_BOOST_BUILD_CMDS
        --user-config=$(@D)/user-config.jam \
        $(HOST_BOOST_OPTS) \
        --ignore-site-config \
-       --prefix=$(HOST_DIR)/usr )
+       --prefix=$(HOST_DIR) )
 endef
 
 define HOST_BOOST_INSTALL_CMDS
        (cd $(@D) && ./b2 -j$(PARALLEL_JOBS) -q \
        --user-config=$(@D)/user-config.jam \
        $(HOST_BOOST_OPTS) \
-       --prefix=$(HOST_DIR)/usr \
+       --prefix=$(HOST_DIR) \
        --ignore-site-config \
        --layout=$(BOOST_LAYOUT) install )
 endef

diff --git a/package/bzip2/bzip2.mk b/package/bzip2/bzip2.mk
index 0597ab97d620b4db383e8c2bd6b0ff09ab51217d..62571ed5a3a6265f856d83116f75076bc33885ba 100644 (file)
--- a/package/bzip2/bzip2.mk
+++ b/package/bzip2/bzip2.mk
@@ -60,9 +60,9 @@ endef
 
 define HOST_BZIP2_INSTALL_CMDS
        $(HOST_MAKE_ENV) \
-               $(MAKE) PREFIX=$(HOST_DIR)/usr -C $(@D) install
+               $(MAKE) PREFIX=$(HOST_DIR) -C $(@D) install
        $(HOST_MAKE_ENV) \
-               $(MAKE) -f Makefile-libbz2_so PREFIX=$(HOST_DIR)/usr -C $(@D) install
+               $(MAKE) -f Makefile-libbz2_so PREFIX=$(HOST_DIR) -C $(@D) install
 endef
 
 $(eval $(generic-package))

diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk
index 46bd1e4e5f9e2db998484d1fb201a8263953c7b3..d5d18ffd3c6b923f09a6345d67d44470fcd4809f 100644 (file)
--- a/package/cmake/cmake.mk
+++ b/package/cmake/cmake.mk
@@ -41,7 +41,7 @@ define HOST_CMAKE_CONFIGURE_CMDS
        (cd $(@D); \
                $(HOST_CONFIGURE_OPTS) \
                CFLAGS="$(HOST_CMAKE_CFLAGS)" \
-               ./bootstrap --prefix=$(HOST_DIR)/usr \
+               ./bootstrap --prefix=$(HOST_DIR) \
                        --parallel=$(PARALLEL_JOBS) -- \
                        -DCMAKE_C_FLAGS="$(HOST_CMAKE_CFLAGS)" \
                        -DCMAKE_CXX_FLAGS="$(HOST_CMAKE_CXXFLAGS)" \

diff --git a/package/cryptopp/cryptopp.mk b/package/cryptopp/cryptopp.mk
index 5c5def5bc5c2e292e956b1113e835ee9c6092dc5..4b121aef2dbee46efe6461381a84d90bc34c6eaa 100644 (file)
--- a/package/cryptopp/cryptopp.mk
+++ b/package/cryptopp/cryptopp.mk
@@ -24,7 +24,7 @@ define HOST_CRYPTOPP_BUILD_CMDS
 endef
 
 define HOST_CRYPTOPP_INSTALL_CMDS
-       $(HOST_MAKE_ENV) $(MAKE) -C $(@D) PREFIX=$(HOST_DIR)/usr install
+       $(HOST_MAKE_ENV) $(MAKE) -C $(@D) PREFIX=$(HOST_DIR) install
 endef
 
 $(eval $(host-generic-package))

diff --git a/package/dtc/dtc.mk b/package/dtc/dtc.mk
index 9d50e359661159c6b14805cfc08c50c317e0ee00..dd0f30d9aef4090fcfc0973448c78e44ba5109ad 100644 (file)
--- a/package/dtc/dtc.mk
+++ b/package/dtc/dtc.mk
@@ -47,11 +47,11 @@ endef
 
 # host build
 define HOST_DTC_BUILD_CMDS
-       $(HOST_CONFIGURE_OPTS) $(MAKE) CFLAGS="$(HOST_CFLAGS) -fPIC" -C $(@D) PREFIX=$(HOST_DIR)/usr
+       $(HOST_CONFIGURE_OPTS) $(MAKE) CFLAGS="$(HOST_CFLAGS) -fPIC" -C $(@D) PREFIX=$(HOST_DIR)
 endef
 
 define HOST_DTC_INSTALL_CMDS
-       $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) PREFIX=$(HOST_DIR)/usr install-bin
+       $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) PREFIX=$(HOST_DIR) install-bin
 endef
 
 $(eval $(generic-package))

diff --git a/package/execline/execline.mk b/package/execline/execline.mk
index cc56a3a8b6994082987f8679afc6f21a947374a3..86ed3f2d86c375b824aaea45e72e1d2a1dcc3ae4 100644 (file)
--- a/package/execline/execline.mk
+++ b/package/execline/execline.mk
@@ -45,7 +45,7 @@ endef
 HOST_EXECLINE_DEPENDENCIES = host-skalibs
 
 HOST_EXECLINE_CONF_OPTS = \
-       --prefix=$(HOST_DIR)/usr \
+       --prefix=$(HOST_DIR) \
        --shebangdir=/usr/bin \
        --with-sysdeps=$(HOST_DIR)/usr/lib/skalibs/sysdeps \
        --with-include=$(HOST_DIR)/usr/include \

diff --git a/package/faketime/faketime.mk b/package/faketime/faketime.mk
index 03879ea65c13dbcdcd41e2356832e7fc99f372ca..6c88a71aa3c8141444904906585b19d368ab041b 100644 (file)
--- a/package/faketime/faketime.mk
+++ b/package/faketime/faketime.mk
@@ -10,11 +10,11 @@ FAKETIME_LICENSE = GPL-2.0
 FAKETIME_LICENSE_FILES = COPYING
 
 define HOST_FAKETIME_BUILD_CMDS
-       $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) PREFIX=$(HOST_DIR)/usr
+       $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) PREFIX=$(HOST_DIR)
 endef
 
 define HOST_FAKETIME_INSTALL_CMDS
-       $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) PREFIX=$(HOST_DIR)/usr install
+       $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) PREFIX=$(HOST_DIR) install
 endef
 
 $(eval $(host-generic-package))

diff --git a/package/gcc/gcc-final/gcc-final.mk b/package/gcc/gcc-final/gcc-final.mk
index 12f08c81a89fe536bf46dfb944190668c2dc684d..78466fa4da405d69c83d37fbafea1f3f98d15ef2 100644 (file)
--- a/package/gcc/gcc-final/gcc-final.mk
+++ b/package/gcc/gcc-final/gcc-final.mk
@@ -43,7 +43,7 @@ define  HOST_GCC_FINAL_CONFIGURE_CMDS
                LDFLAGS="$(HOST_LDFLAGS)" \
                $(HOST_GCC_FINAL_CONF_ENV) \
                ./configure \
-               --prefix="$(HOST_DIR)/usr" \
+               --prefix="$(HOST_DIR)" \
                --sysconfdir="$(HOST_DIR)/etc" \
                --enable-static \
                $(QUIET) $(HOST_GCC_FINAL_CONF_OPTS) \

diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk
index 7a031b7485d66f1c4af86dce9ca079cdf640ed06..d59592007547ded0493eca43944f4e13e756f788 100644 (file)
--- a/package/kodi/kodi.mk
+++ b/package/kodi/kodi.mk
@@ -63,7 +63,7 @@ KODI_CONF_OPTS += \
        -DENABLE_INTERNAL_FFMPEG=OFF \
        -DKODI_DEPENDSBUILD=OFF \
        -DENABLE_OPENSSL=ON \
-       -DNATIVEPREFIX=$(HOST_DIR)/usr \
+       -DNATIVEPREFIX=$(HOST_DIR) \
        -DDEPENDS_PATH=$(@D) \
        -DWITH_TEXTUREPACKER=$(HOST_DIR)/usr/bin/TexturePacker \
        -DLIBDVDCSS_URL=$(DL_DIR)/$(KODI_LIBDVDCSS_VERSION).tar.gz \

diff --git a/package/libsepol/libsepol.mk b/package/libsepol/libsepol.mk
index d360bfbcb12b0a1ab93c994905ce46b4b85859da..233334eea24923682d3772f846948f5f950f5bdd 100644 (file)
--- a/package/libsepol/libsepol.mk
+++ b/package/libsepol/libsepol.mk
@@ -36,7 +36,7 @@ endef
 HOST_LIBSEPOL_MAKE_ENV = \
        $(HOST_MAKE_ENV) \
        DESTDIR=$(HOST_DIR)/usr \
-       PREFIX=$(HOST_DIR)/usr
+       PREFIX=$(HOST_DIR)
 
 define HOST_LIBSEPOL_BUILD_CMDS
        $(HOST_LIBSEPOL_MAKE_ENV) $(MAKE) -C $(@D) $(HOST_CONFIGURE_OPTS)

diff --git a/package/libxml-parser-perl/libxml-parser-perl.mk b/package/libxml-parser-perl/libxml-parser-perl.mk
index 401470d907183661095d3c697c79eb37992a01b0..bca1c34a8f36e02f8f3f052cae48e719c134a75b 100644 (file)
--- a/package/libxml-parser-perl/libxml-parser-perl.mk
+++ b/package/libxml-parser-perl/libxml-parser-perl.mk
@@ -14,7 +14,7 @@ LIBXML_PARSER_PERL_RUN_PERL = `which perl`
 define HOST_LIBXML_PARSER_PERL_CONFIGURE_CMDS
        (cd $(@D) ; \
                $(HOST_CONFIGURE_OPTS) $(LIBXML_PARSER_PERL_RUN_PERL) Makefile.PL \
-                       PREFIX=$(HOST_DIR)/usr \
+                       PREFIX=$(HOST_DIR) \
                        EXPATLIBPATH=$(HOST_DIR)/usr/lib \
                        EXPATINCPATH=$(HOST_DIR)/usr/include \
                        INSTALLDIRS=site \

diff --git a/package/luajit/luajit.mk b/package/luajit/luajit.mk
index 300e6dbc29906103b5b7b56d52f224f643a73a40..939fa660d86cc426d0e31810e94d8cdbd11a51dc 100644 (file)
--- a/package/luajit/luajit.mk
+++ b/package/luajit/luajit.mk
@@ -66,13 +66,13 @@ LUAJIT_POST_INSTALL_TARGET_HOOKS += LUAJIT_INSTALL_SYMLINK
 
 # host-efl package needs host-luajit to be linked dynamically.
 define HOST_LUAJIT_BUILD_CMDS
-       $(HOST_MAKE_ENV) $(MAKE) PREFIX="$(HOST_DIR)/usr" BUILDMODE=dynamic \
+       $(HOST_MAKE_ENV) $(MAKE) PREFIX="$(HOST_DIR)" BUILDMODE=dynamic \
                TARGET_LDFLAGS="$(HOST_LDFLAGS)" \
                -C $(@D) amalg
 endef
 
 define HOST_LUAJIT_INSTALL_CMDS
-       $(HOST_MAKE_ENV) $(MAKE) PREFIX="$(HOST_DIR)/usr" LDCONFIG=true -C $(@D) install
+       $(HOST_MAKE_ENV) $(MAKE) PREFIX="$(HOST_DIR)" LDCONFIG=true -C $(@D) install
 endef
 
 $(eval $(generic-package))

diff --git a/package/luarocks/luarocks.mk b/package/luarocks/luarocks.mk
index d18056a5279445007cf5b2ee503ef0dd818c7b1d..646e43b6688723e53cbac87a3789290ba9c4d3c7 100644 (file)
--- a/package/luarocks/luarocks.mk
+++ b/package/luarocks/luarocks.mk
@@ -19,7 +19,7 @@ LUAROCKS_CFLAGS += -DLUA_COMPAT_5_2
 endif
 
 HOST_LUAROCKS_CONF_OPTS = \
-       --prefix=$(HOST_DIR)/usr \
+       --prefix=$(HOST_DIR) \
        --sysconfdir=$(LUAROCKS_CONFIG_DIR) \
        --with-lua=$(HOST_DIR)/usr
 
@@ -34,7 +34,7 @@ endef
 define HOST_LUAROCKS_INSTALL_CMDS
        rm -f $(LUAROCKS_CONFIG_FILE)
        $(MAKE1) -C $(@D) install \
-               PREFIX=$(HOST_DIR)/usr
+               PREFIX=$(HOST_DIR)
        echo "-- BR cross-compilation"                          >> $(LUAROCKS_CONFIG_FILE)
        echo "variables = {"                                    >> $(LUAROCKS_CONFIG_FILE)
        echo "   LUA_INCDIR = [[$(STAGING_DIR)/usr/include]],"  >> $(LUAROCKS_CONFIG_FILE)

diff --git a/package/lz4/lz4.mk b/package/lz4/lz4.mk
index d350d4c099dd82fe2d65470b237dab2e52293da9..91ff43b052c185f098f47080690aa94ebb143795 100644 (file)
--- a/package/lz4/lz4.mk
+++ b/package/lz4/lz4.mk
@@ -22,7 +22,7 @@ define HOST_LZ4_BUILD_CMDS
 endef
 
 define HOST_LZ4_INSTALL_CMDS
-       $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) PREFIX=$(HOST_DIR)/usr \
+       $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) PREFIX=$(HOST_DIR) \
                install -C $(@D)
 endef
 

diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk
index b5d73be6e0649b3575a3e96a9339cfc13540afb1..ecdc9ce290a83d7d4d90ff463d2aaddf26743afb 100644 (file)
--- a/package/nodejs/nodejs.mk
+++ b/package/nodejs/nodejs.mk
@@ -55,7 +55,7 @@ define HOST_NODEJS_CONFIGURE_CMDS
                PATH=$(@D)/bin:$(BR_PATH) \
                PYTHON=$(HOST_DIR)/usr/bin/python2 \
                $(HOST_DIR)/usr/bin/python2 ./configure \
-               --prefix=$(HOST_DIR)/usr \
+               --prefix=$(HOST_DIR) \
                --without-snapshot \
                --without-dtrace \
                --without-etw \

diff --git a/package/openssl/openssl.mk b/package/openssl/openssl.mk
index 5f56b445abaef03dccf11c1e8559de35ab9183e4..ec8e6f204c4f18ed0be201a1d1349fd75eca1db3 100644 (file)
--- a/package/openssl/openssl.mk
+++ b/package/openssl/openssl.mk
@@ -61,7 +61,7 @@ define HOST_OPENSSL_CONFIGURE_CMDS
        (cd $(@D); \
                $(HOST_CONFIGURE_OPTS) \
                ./config \
-               --prefix=$(HOST_DIR)/usr \
+               --prefix=$(HOST_DIR) \
                --openssldir=$(HOST_DIR)/etc/ssl \
                --libdir=/lib \
                shared \

diff --git a/package/perl/perl.mk b/package/perl/perl.mk
index ca23eb0bf7aec91b9ea37931f7d6c9f7c4a5ddd7..fb0cec3d4abd20dbe87c867d0c161d66cd627dba 100644 (file)
--- a/package/perl/perl.mk
+++ b/package/perl/perl.mk
@@ -91,7 +91,7 @@ endef
 
 HOST_PERL_CONF_OPTS = \
        -des \
-       -Dprefix="$(HOST_DIR)/usr" \
+       -Dprefix="$(HOST_DIR)" \
        -Dcc="$(HOSTCC)"
 
 define HOST_PERL_CONFIGURE_CMDS

diff --git a/package/pngquant/pngquant.mk b/package/pngquant/pngquant.mk
index 938603a21d4adc671adcb18d418d09daeb86e97c..f0104fb0744654783c15e6a317c732d59ea0b529 100644 (file)
--- a/package/pngquant/pngquant.mk
+++ b/package/pngquant/pngquant.mk
@@ -37,7 +37,7 @@ define HOST_PNGQUANT_CONFIGURE_CMDS
        (cd $(@D) && \
                $(HOST_CONFIGURE_OPTS) \
                CC=$(HOSTCC_NOCCACHE) \
-               ./configure --prefix=$(HOST_DIR)/usr \
+               ./configure --prefix=$(HOST_DIR) \
                --without-lcms2 \
        )
 endef

diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk
index 9335467a2850ae07e6dc0806ec68ac6a7b95d368..e11307cde88b139a26b341a49a41242e3e91fe18 100644 (file)
--- a/package/qemu/qemu.mk
+++ b/package/qemu/qemu.mk
@@ -126,7 +126,7 @@ define HOST_QEMU_CONFIGURE_CMDS
        cd $(@D); $(HOST_CONFIGURE_OPTS) CPP="$(HOSTCC) -E" \
                ./configure \
                --target-list="$(HOST_QEMU_TARGETS)" \
-               --prefix="$(HOST_DIR)/usr" \
+               --prefix="$(HOST_DIR)" \
                --interp-prefix=$(STAGING_DIR) \
                --cc="$(HOSTCC)" \
                --host-cc="$(HOSTCC)" \

diff --git a/package/s6-rc/s6-rc.mk b/package/s6-rc/s6-rc.mk
index 16089dc23a161b615b237bb9036af2632aeb0aec..0e25f038ede81a8b071ae3041306a1c62307ca34 100644 (file)
--- a/package/s6-rc/s6-rc.mk
+++ b/package/s6-rc/s6-rc.mk
@@ -47,7 +47,7 @@ endef
 HOST_S6_RC_DEPENDENCIES = host-s6
 
 HOST_S6_RC_CONF_OPTS = \
-       --prefix=$(HOST_DIR)/usr \
+       --prefix=$(HOST_DIR) \
        --libexecdir=/usr/libexec \
        --with-sysdeps=$(HOST_DIR)/usr/lib/skalibs/sysdeps \
        --with-include=$(HOST_DIR)/usr/include \

diff --git a/package/s6/s6.mk b/package/s6/s6.mk
index f0235da45e5a79bd8b713fccae18def54f50991f..411345781df2af4c915afc3583b9a05632510770 100644 (file)
--- a/package/s6/s6.mk
+++ b/package/s6/s6.mk
@@ -46,7 +46,7 @@ endef
 HOST_S6_DEPENDENCIES = host-execline
 
 HOST_S6_CONF_OPTS = \
-       --prefix=$(HOST_DIR)/usr \
+       --prefix=$(HOST_DIR) \
        --with-sysdeps=$(HOST_DIR)/usr/lib/skalibs/sysdeps \
        --with-include=$(HOST_DIR)/usr/include \
        --with-dynlib=$(HOST_DIR)/usr/lib \

diff --git a/package/sdl_image/sdl_image.mk b/package/sdl_image/sdl_image.mk
index 6ea657bcff859150f71bf192f4565e31887fcb6f..ee0712cc2747f348072e56489c47de67cbe8338d 100644 (file)
--- a/package/sdl_image/sdl_image.mk
+++ b/package/sdl_image/sdl_image.mk
@@ -37,8 +37,8 @@ SDL_IMAGE_DEPENDENCIES = sdl \
        $(if $(BR2_PACKAGE_SDL_IMAGE_WEBP),webp)
 
 HOST_SDL_IMAGE_CONF_OPTS = \
-       --with-sdl-prefix=$(HOST_DIR)/usr \
-       --with-sdl-exec-prefix=$(HOST_DIR)/usr \
+       --with-sdl-prefix=$(HOST_DIR) \
+       --with-sdl-exec-prefix=$(HOST_DIR) \
        --disable-sdltest \
        --disable-static \
        --disable-jpg-shared \

diff --git a/package/skalibs/skalibs.mk b/package/skalibs/skalibs.mk
index c6f97ee99799af3de46fd0149288255beafee99c..b8526dd778d41c08284c6c25b46d84213d67a767 100644 (file)
--- a/package/skalibs/skalibs.mk
+++ b/package/skalibs/skalibs.mk
@@ -33,7 +33,7 @@ define SKALIBS_INSTALL_STAGING_CMDS
 endef
 
 HOST_SKALIBS_CONF_OPTS = \
-       --prefix=$(HOST_DIR)/usr \
+       --prefix=$(HOST_DIR) \
        --disable-static \
        --enable-shared \
        --disable-allstatic

diff --git a/package/sunxi-tools/sunxi-tools.mk b/package/sunxi-tools/sunxi-tools.mk
index 9bb0b9eff9c029926b47722e39b6d8476bbf3fd2..c193769c107d44de27a3e81d7d71e559f3a576ed 100644 (file)
--- a/package/sunxi-tools/sunxi-tools.mk
+++ b/package/sunxi-tools/sunxi-tools.mk
@@ -12,13 +12,13 @@ HOST_SUNXI_TOOLS_DEPENDENCIES = host-libusb host-pkgconf
 FEX2BIN = $(HOST_DIR)/usr/bin/fex2bin
 
 define HOST_SUNXI_TOOLS_BUILD_CMDS
-       $(HOST_MAKE_ENV) $(MAKE) CC="$(HOSTCC)" PREFIX=$(HOST_DIR)/usr \
+       $(HOST_MAKE_ENV) $(MAKE) CC="$(HOSTCC)" PREFIX=$(HOST_DIR) \
                EXTRA_CFLAGS="$(HOST_CFLAGS)" LDFLAGS="$(HOST_LDFLAGS)" \
                -C $(@D) tools
 endef
 
 define HOST_SUNXI_TOOLS_INSTALL_CMDS
-       $(HOST_MAKE_ENV) $(MAKE) PREFIX=$(HOST_DIR)/usr \
+       $(HOST_MAKE_ENV) $(MAKE) PREFIX=$(HOST_DIR) \
                -C $(@D) install-tools
 endef
 

diff --git a/package/zip/zip.mk b/package/zip/zip.mk
index 66d94b3c68f4090e2fe7cf13857e18ccb77c2616..0bd3d3c11f0707ebee7a30aca0e035d30504c399 100644 (file)
--- a/package/zip/zip.mk
+++ b/package/zip/zip.mk
@@ -47,7 +47,7 @@ endef
 
 define HOST_ZIP_INSTALL_CMDS
        $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D) -f unix/Makefile install \
-               prefix=$(HOST_DIR)/usr
+               prefix=$(HOST_DIR)
 endef
 
 $(eval $(generic-package))

diff --git a/package/zlib/zlib.mk b/package/zlib/zlib.mk
index 23c6e95cfae597862c16fe03c32a7cb62cba06ad..9b5f52e8074a79d01f5290f30a4b7911d678fe07 100644 (file)
--- a/package/zlib/zlib.mk
+++ b/package/zlib/zlib.mk
@@ -38,7 +38,7 @@ define HOST_ZLIB_CONFIGURE_CMDS
                $(HOST_CONFIGURE_ARGS) \
                $(HOST_CONFIGURE_OPTS) \
                ./configure \
-               --prefix="$(HOST_DIR)/usr" \
+               --prefix="$(HOST_DIR)" \
                --sysconfdir="$(HOST_DIR)/etc" \
        )
 endef