summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Melki <christian.melki@t2data.com>2021-08-09 10:36:21 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2021-09-03 17:18:38 +0200
commit3fa9174fa8ce494337253620f87ed2c9de631cec (patch)
tree9aa7a3831703ccfc6c9e0b633b3d2865c8270a60
parent190b7ace4f943d3fe5f1e7fef0c5f0603e48c323 (diff)
downloadptxdist-3fa9174fa8ce494337253620f87ed2c9de631cec.tar.gz
ptxdist-3fa9174fa8ce494337253620f87ed2c9de631cec.tar.xz
pre/Rules.make: Let CMAKE_INSTALL_LIBDIR be relative, as per spec.
This means that packages that assume that this variable is absolute will have to be modified. Adding something like -DCMAKE_INSTALL_LIBDIR=/usr/$(CROSS_LIB_DIR), after CROSS_CMAKE_USR to your CONF_OPT will probably suffice. Signed-off-by: Christian Melki <christian.melki@t2data.com> Reviewed-by: Denis Osterland-Heim <denis.osterland@diehl.com> Tested-by: Alexander Dahl <ada@thorsis.com> Message-Id: <20210809083621.3676-1-christian.melki@t2data.com> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--rules/pre/Rules.make2
1 files changed, 1 insertions, 1 deletions
diff --git a/rules/pre/Rules.make b/rules/pre/Rules.make
index 54a677c47..0943a51b7 100644
--- a/rules/pre/Rules.make
+++ b/rules/pre/Rules.make
@@ -233,7 +233,7 @@ CROSS_AUTOCONF_ROOT := $(CROSS_AUTOCONF_SYSROOT_ROOT) $(CROSS_AUTOCONF_ARCH)
CROSS_CMAKE_USR := \
-DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_INSTALL_LIBDIR=/usr/$(CROSS_LIB_DIR) \
+ -DCMAKE_INSTALL_LIBDIR=$(CROSS_LIB_DIR) \
-DCMAKE_INSTALL_SYSCONFDIR=/etc \
-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
-DCMAKE_TOOLCHAIN_FILE='${PTXDIST_CMAKE_TOOLCHAIN_TARGET}'