Skip to content

Commit

Permalink
CI: Set meson directory variables
Browse files Browse the repository at this point in the history
Meson defaults to /usr/local
Set prefix to /usr
Set libdir to /usr/lib64 on Fedora

Signed-off-by: Callum Farmer <[email protected]>
  • Loading branch information
gmbr3 committed Sep 26, 2024
1 parent d548188 commit 0e6c675
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions contrib/ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ if [ "$OS" = "fedora" ]; then
sudo dnf install -y \
https://kojipkgs.fedoraproject.org//packages/gnu-efi/3.0.18/3.fc40/x86_64/gnu-efi-3.0.18-3.fc40.x86_64.rpm \
https://kojipkgs.fedoraproject.org//packages/gnu-efi/3.0.18/3.fc40/x86_64/gnu-efi-devel-3.0.18-3.fc40.x86_64.rpm
meson build
meson build --prefix=/usr --libdir=/usr/lib64
VERSION=`meson introspect build --projectinfo | jq -r .version`
RPMVERSION=${VERSION//-/.}
sed "s,#VERSION#,$RPMVERSION,;
Expand Down Expand Up @@ -43,6 +43,6 @@ elif [ "$OS" = "debian-x86_64" ] || [ "$OS" = "debian-i386" ]; then
debuild --no-lintian --preserve-envvar CI --preserve-envvar CC \
--preserve-envvar QUBES_OPTION
else
meson build
meson build --prefix=/usr
ninja -C build
fi

0 comments on commit 0e6c675

Please sign in to comment.