From ebb5898b180ef8c51e877c260a61174ac471fafb Mon Sep 17 00:00:00 2001 From: fraggerfox Date: Mon, 5 Aug 2024 06:55:06 +0200 Subject: [PATCH] Use pkg-config instead of hard-coded paths. --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 76538034a..506c98a4f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -258,12 +258,12 @@ jobs: PKG_PATH="https://ftp.netbsd.org/pub/pkgsrc/packages/NetBSD/amd64/10.0/All/" export PATH PKG_PATH /usr/sbin/pkg_add pkgin - pkgin -y install autoconf automake libtool ncurses gmake git + pkgin -y install autoconf automake libtool ncurses pkg-config gmake git git config --global --add safe.directory /home/runner/work/htop/htop run: | set -e ./autogen.sh - CPPFLAGS="-I/usr/pkg/include -I/usr/pkg/include/ncurses" LDFLAGS="-L/usr/pkg/lib" ./configure --enable-unicode --enable-werror + CPPFLAGS=$(pkg-config --cflags ncurses) LDFLAGS=$(pkg-config --libs ncurses) ./configure --enable-unicode --enable-werror gmake -k build-openbsd-latest-clang: