diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2023-03-20 16:55:42 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2023-03-22 20:16:35 +0100 |
| commit | e418c14aef17e94bffd91e439656101e939aba5f (patch) | |
| tree | bff89f3bbb21316a3ea545d6307dfe722db27305 /rules/pre | |
| parent | a04eeced8d8a29c860a2339a640c1ef28ce1cd69 (diff) | |
| download | ptxdist-e418c14aef17e94bffd91e439656101e939aba5f.tar.gz ptxdist-e418c14aef17e94bffd91e439656101e939aba5f.tar.xz | |
pre/Rules.make: stop using $(CROSS_LIB_DIR)
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/pre')
| -rw-r--r-- | rules/pre/Rules.make | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/rules/pre/Rules.make b/rules/pre/Rules.make index 3b89346ee..c7497c313 100644 --- a/rules/pre/Rules.make +++ b/rules/pre/Rules.make @@ -220,10 +220,10 @@ CROSS_ENV := \ # CROSS_AUTOCONF_SYSROOT_USR := \ - --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=/usr/$(CROSS_LIB_DIR) + --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=/usr/lib CROSS_AUTOCONF_SYSROOT_ROOT := \ - --libdir=/$(CROSS_LIB_DIR) --prefix= + --libdir=/lib --prefix= CROSS_AUTOCONF_ARCH := \ --build=$(GNU_HOST) \ @@ -234,7 +234,6 @@ CROSS_AUTOCONF_ROOT := $(CROSS_AUTOCONF_SYSROOT_ROOT) $(CROSS_AUTOCONF_ARCH) CROSS_CMAKE_USR := \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=$(CROSS_LIB_DIR) \ -DCMAKE_INSTALL_SYSCONFDIR=/etc \ -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \ -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \ @@ -259,7 +258,7 @@ CROSS_MESON_USR := \ -Dbackend=ninja \ -Dbuildtype=debugoptimized \ -Dpkgconfig.relocatable=true \ - -Dlibdir=$(CROSS_LIB_DIR) \ + -Dlibdir=lib \ -Dprefix=/usr CROSS_MESON_ENV = \ |