package: clean up remaining references to $(HOST_DIR)/usr

Signed-off-by: Ferdinand van Aartsen <ferdinand@ombud.nl>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

diff --git a/package/asterisk/asterisk.mk b/package/asterisk/asterisk.mk
index 430b122655f4a7ee691274ded59fec1b96caa9a0..f31e2394f75f0a8b580d7e8aa414ed683bba6c68 100644 (file)
--- a/package/asterisk/asterisk.mk
+++ b/package/asterisk/asterisk.mk
@@ -292,7 +292,7 @@ HOST_ASTERISK_CONF_ENV = CONFIG_LIBXML2=$(HOST_DIR)/bin/xml2-config
 HOST_ASTERISK_CONF_OPTS = \
        --without-newt \
        --without-curses \
-       --with-ncurses=$(HOST_DIR)/usr
+       --with-ncurses=$(HOST_DIR)
 
 # Not an automake package, so does not inherit LDFLAGS et al. from
 # the configure run.

diff --git a/package/clang/clang.mk b/package/clang/clang.mk
index 230d0c6b73cc226a28d923b77dc6b0fd551477e3..b0fc3ab8001890e78f40438fcc1bb4b486a65d6d 100644 (file)
--- a/package/clang/clang.mk
+++ b/package/clang/clang.mk
@@ -51,8 +51,8 @@ CLANG_CONF_OPTS += \
 
 HOST_CLANG_CONF_OPTS += -DLLVM_CONFIG:FILEPATH=$(HOST_DIR)/bin/llvm-config
 CLANG_CONF_OPTS += -DLLVM_CONFIG:FILEPATH=$(STAGING_DIR)/usr/bin/llvm-config \
-       -DCLANG_TABLEGEN:FILEPATH=$(HOST_DIR)/usr/bin/clang-tblgen \
-       -DLLVM_TABLEGEN_EXE:FILEPATH=$(HOST_DIR)/usr/bin/llvm-tblgen
+       -DCLANG_TABLEGEN:FILEPATH=$(HOST_DIR)/bin/clang-tblgen \
+       -DLLVM_TABLEGEN_EXE:FILEPATH=$(HOST_DIR)/bin/llvm-tblgen
 
 # Clang can't be used as compiler on the target since there are no
 # development files (headers) and other build tools. So remove clang
@@ -81,7 +81,7 @@ CLANG_POST_INSTALL_TARGET_HOOKS += CLANG_CLEANUP_TARGET
 # for cross-compiling clang
 define HOST_CLANG_INSTALL_CLANG_TBLGEN
        $(INSTALL) -D -m 0755 $(HOST_CLANG_BUILDDIR)/bin/clang-tblgen \
-               $(HOST_DIR)/usr/bin/clang-tblgen
+               $(HOST_DIR)/bin/clang-tblgen
 endef
 HOST_CLANG_POST_INSTALL_HOOKS = HOST_CLANG_INSTALL_CLANG_TBLGEN
 

diff --git a/package/libhttpparser/libhttpparser.mk b/package/libhttpparser/libhttpparser.mk
index c71e043cdc5a07617063568ba51e3ca6687a95ae..502ab75b882344008ae46a0b681b55521fbe2d12 100644 (file)
--- a/package/libhttpparser/libhttpparser.mk
+++ b/package/libhttpparser/libhttpparser.mk
@@ -28,7 +28,7 @@ define HOST_LIBHTTPPARSER_BUILD_CMDS
 endef
 
 define HOST_LIBHTTPPARSER_INSTALL_CMDS
-       $(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D) PREFIX=$(HOST_DIR)/usr install
+       $(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D) PREFIX=$(HOST_DIR) install
 endef
 
 $(eval $(generic-package))

diff --git a/package/libssh2/libssh2.mk b/package/libssh2/libssh2.mk
index 0e13701b2995088f08c96a3024975bf0ed2da83c..89cb733224f7e117d4f32f4c61de2dcc29b2fcd9 100644 (file)
--- a/package/libssh2/libssh2.mk
+++ b/package/libssh2/libssh2.mk
@@ -42,7 +42,7 @@ endif
 
 HOST_LIBSSH2_DEPENDENCIES += host-openssl
 HOST_LIBSSH2_CONF_OPTS += --with-openssl \
-       --with-libssl-prefix=$(HOST_DIR)/usr \
+       --with-libssl-prefix=$(HOST_DIR) \
        --without-libgcrypt
 
 $(eval $(autotools-package))

diff --git a/package/prosody/prosody.mk b/package/prosody/prosody.mk
index d95578253d6d200b890851f84e5bf141590ae9e6..5282a9af0f3b571d6b07bc51a881d85a0bfe4f7e 100644 (file)
--- a/package/prosody/prosody.mk
+++ b/package/prosody/prosody.mk
@@ -14,7 +14,7 @@ PROSODY_CFLAGS = $(TARGET_CFLAGS) -fPIC -std=c99 \
        $(if BR2_TOOLCHAIN_USES_MUSL,-DWITHOUT_MALLINFO)
 
 PROSODY_CONF_OPTS = \
-       --with-lua-bin=$(HOST_DIR)/usr/bin \
+       --with-lua-bin=$(HOST_DIR)/bin \
        --with-lua=$(STAGING_DIR)/usr \
        --lua-version=$(LUAINTERPRETER_ABIVER) \
        --c-compiler=$(TARGET_CC) \

diff --git a/package/xmlstarlet/xmlstarlet.mk b/package/xmlstarlet/xmlstarlet.mk
index 1d748dc5949b77df26efab51eace1fbff771c257..b79c3f566db5798f89389944c889b97bc95bd281 100644 (file)
--- a/package/xmlstarlet/xmlstarlet.mk
+++ b/package/xmlstarlet/xmlstarlet.mk
@@ -27,8 +27,8 @@ endif
 HOST_XMLSTARLET_DEPENDENCIES += host-libxml2 host-libxslt
 
 HOST_XMLSTARLET_CONF_OPTS += \
-       --with-libxml-prefix=$(HOST_DIR)/usr \
-       --with-libxslt-prefix=$(HOST_DIR)/usr
+       --with-libxml-prefix=$(HOST_DIR) \
+       --with-libxslt-prefix=$(HOST_DIR)
 
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))