From e6ead1d760525b40ac1ef06dae77b95717b6660e Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Mon, 12 Feb 2024 14:33:31 -0700
Subject: [PATCH] Install netsurf in /usr
---
recipes/net/netsurf/manifest | 2 +-
recipes/net/netsurf/recipe.sh | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/recipes/net/netsurf/manifest b/recipes/net/netsurf/manifest
index b671cb46f..b1edac6ab 100644
--- a/recipes/net/netsurf/manifest
+++ b/recipes/net/netsurf/manifest
@@ -1,5 +1,5 @@
name=Netsurf
-binary=/bin/netsurf-fb
+binary=/usr/bin/netsurf-fb
icon=/ui/icons/apps/internet-web-browser.png
accept=*.html
author=The Netsurf Developers
diff --git a/recipes/net/netsurf/recipe.sh b/recipes/net/netsurf/recipe.sh
index 2eda2d70b..640d957e9 100644
--- a/recipes/net/netsurf/recipe.sh
+++ b/recipes/net/netsurf/recipe.sh
@@ -14,7 +14,7 @@ function recipe_build {
export LDFLAGS="-L${COOKBOOK_SYSROOT}/lib -L${PWD}/inst-${TARGET}/lib -static -Wl,--allow-multiple-definition -Wl,-Bstatic"
# nghttp2 is not linked for some reason
export LDFLAGS="${LDFLAGS} -lcurl -lnghttp2"
- "$REDOX_MAKE" V=1 -j"$($NPROC)"
+ "$REDOX_MAKE" PREFIX=/usr V=1 -j"$($NPROC)"
skip=1
}
@@ -25,7 +25,7 @@ function recipe_clean {
function recipe_stage {
dest="$(realpath "$1")"
- "$REDOX_MAKE" DESTDIR="$dest" install
+ "$REDOX_MAKE" DESTDIR="$dest" PREFIX=/usr install
mkdir -pv "$dest/ui/apps"
cp -v "${COOKBOOK_RECIPE}/manifest" "$dest/ui/apps/00_netsurf"
skip=1
--
GitLab