[vlc-commits] [Git][videolan/vlc][3.0.x] contrib: main.mak: force LIBDIR to lib/

[Rémi Denis-Courmont (@Courmisch)]

Rémi Denis-Courmont pushed to branch 3.0.x at VideoLAN / VLC


Commits:
094970ab by Alexandre Janniaux at 2022-05-03T19:21:12+00:00
contrib: main.mak: force LIBDIR to lib/

CMAKE_INSTALL_LIBDIR can be lib, lib64 or even lib/<multiarch-tuple> on
Debian, but we already split the contribs by multiarch-tuple /
installation directory at the prefix level for contribs to avoid mixups.

Preventing installation in lib64/ ensure every pc files from contribs/
are in the PKG_CONFIG_PATH when configuring.

Refs #26888

Cherry-picked from commit 346b2fb9b68ef9cb7da0e4daf757f6334c74c57d.

Signed-off-by: Alexandre Janniaux <ajanni at videolabs.io>

- - - - -


1 changed file:

- contrib/src/main.mak


Changes:

=====================================
contrib/src/main.mak
=====================================
@@ -384,7 +384,8 @@ RECONF = mkdir -p -- $(PREFIX)/share/aclocal && \
 CMAKEBUILD := cmake --build
 CMAKE = cmake . -DCMAKE_TOOLCHAIN_FILE=$(abspath toolchain.cmake) \
 		-DCMAKE_INSTALL_PREFIX:STRING=$(PREFIX) \
-		-DBUILD_SHARED_LIBS:BOOL=OFF
+		-DBUILD_SHARED_LIBS:BOOL=OFF \
+		-DCMAKE_INSTALL_LIBDIR:STRING=lib
 ifdef HAVE_WIN32
 CMAKE += -DCMAKE_DEBUG_POSTFIX:STRING=
 endif



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/094970ab79960cdcab68cfcd12965d545ac5a4a0

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/094970ab79960cdcab68cfcd12965d545ac5a4a0
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance