Merge branch 'tidyup-usr' into 'master'

Tidy up /usr part III

See merge request redox-os/redox!2171

recipes/data/terminfo/recipe.toml

@@ -6,13 +6,13 @@ branch = "master"
 template = "custom"
 script = """
 # only copy common TERM envar
-mkdir -p ${COOKBOOK_STAGE}/share/terminfo/{a,d,l,s,t,v,x}
-cp -r ${COOKBOOK_SOURCE}/tabset ${COOKBOOK_STAGE}/share/
-cp ${COOKBOOK_SOURCE}/terminfo/a/ansi{,-*} ${COOKBOOK_STAGE}/share/terminfo/a/
-cp ${COOKBOOK_SOURCE}/terminfo/d/dumb{,-*} ${COOKBOOK_STAGE}/share/terminfo/d/
-cp ${COOKBOOK_SOURCE}/terminfo/l/linux{,-*} ${COOKBOOK_STAGE}/share/terminfo/l/
-cp ${COOKBOOK_SOURCE}/terminfo/s/screen{,-*} ${COOKBOOK_STAGE}/share/terminfo/s/
-cp ${COOKBOOK_SOURCE}/terminfo/t/tmux{,-*} ${COOKBOOK_STAGE}/share/terminfo/t/
-cp ${COOKBOOK_SOURCE}/terminfo/v/vt100{,-*} ${COOKBOOK_STAGE}/share/terminfo/v/
-cp ${COOKBOOK_SOURCE}/terminfo/x/xterm{,-*} ${COOKBOOK_STAGE}/share/terminfo/x/
+mkdir -p ${COOKBOOK_STAGE}/usr/share/terminfo/{a,d,l,s,t,v,x}
+cp -r ${COOKBOOK_SOURCE}/tabset ${COOKBOOK_STAGE}/usr/share/
+cp ${COOKBOOK_SOURCE}/terminfo/a/ansi{,-*} ${COOKBOOK_STAGE}/usr/share/terminfo/a/
+cp ${COOKBOOK_SOURCE}/terminfo/d/dumb{,-*} ${COOKBOOK_STAGE}/usr/share/terminfo/d/
+cp ${COOKBOOK_SOURCE}/terminfo/l/linux{,-*} ${COOKBOOK_STAGE}/usr/share/terminfo/l/
+cp ${COOKBOOK_SOURCE}/terminfo/s/screen{,-*} ${COOKBOOK_STAGE}/usr/share/terminfo/s/
+cp ${COOKBOOK_SOURCE}/terminfo/t/tmux{,-*} ${COOKBOOK_STAGE}/usr/share/terminfo/t/
+cp ${COOKBOOK_SOURCE}/terminfo/v/vt100{,-*} ${COOKBOOK_STAGE}/usr/share/terminfo/v/
+cp ${COOKBOOK_SOURCE}/terminfo/x/xterm{,-*} ${COOKBOOK_STAGE}/usr/share/terminfo/x/
 """

recipes/games/openttd-opengfx/recipe.toml

@@ -4,6 +4,6 @@ git = "https://gitlab.redox-os.org/redox-os/openttd-opengfx.git"
 [build]
 template = "custom"
 script = """
-mkdir -pv "${COOKBOOK_STAGE}/share/games/openttd/baseset/opengfx"
-cp -Rv "${COOKBOOK_SOURCE}"/* "${COOKBOOK_STAGE}/share/games/openttd/baseset/opengfx"
-"""
+mkdir -pv "${COOKBOOK_STAGE}/usr/share/games/openttd/baseset/opengfx"
+cp -Rv "${COOKBOOK_SOURCE}"/* "${COOKBOOK_STAGE}/usr/share/games/openttd/baseset/opengfx"
+"""

recipes/icons/pop-icon-theme/recipe.toml

@@ -3,16 +3,11 @@ git = "https://github.com/pop-os/icon-theme.git"
 shallow_clone = true
 
 [build]
-template = "custom"
-script = """
-meson setup -Dprefix=/ . "${COOKBOOK_SOURCE}"
-env DESTDIR="${COOKBOOK_STAGE}" meson install
-"""
+template = "meson"
 
 [[optional-packages]]
 name = "cursors"
 files = [
-    "share/icons/Pop/cursors**",
-    "share/icons/Pop/cursor.theme",
+    "usr/share/icons/Pop/cursors**",
+    "usr/share/icons/Pop/cursor.theme",
 ]
-

recipes/libs/sdl1-ttf/recipe.toml

@@ -18,13 +18,5 @@ dependencies = [
 script = """
 DYNAMIC_INIT
 export CFLAGS="${CFLAGS} -I${COOKBOOK_SYSROOT}/include/freetype2"
-COOKBOOK_CONFIGURE_FLAGS=(
-    --prefix=/
-    --build="$(gcc -dumpmachine)"
-    --host="${TARGET}"
-    --disable-shared
-)
 cookbook_configure
-
-rm -f "${COOKBOOK_STAGE}/lib/"*.la
 """

recipes/sound/timidity/recipe.toml

@@ -17,13 +17,13 @@ cookbook_configure
 
 # Create configuration files
 mkdir -pv "${COOKBOOK_STAGE}/etc/timidity"
-echo "soundfont /share/generaluser-gs/generaluser-gs.sf2" >> "${COOKBOOK_STAGE}/etc/timidity/timidity.cfg"
+echo "soundfont /usr/share/generaluser-gs/generaluser-gs.sf2" >> "${COOKBOOK_STAGE}/etc/timidity/timidity.cfg"
 
-mkdir -pv "${COOKBOOK_STAGE}/share/timidity"
-echo "soundfont /share/generaluser-gs/generaluser-gs.sf2" >> "${COOKBOOK_STAGE}/share/timidity/timidity.cfg"
+mkdir -pv "${COOKBOOK_STAGE}/usr/share/timidity"
+echo "soundfont /usr/share/generaluser-gs/generaluser-gs.sf2" >> "${COOKBOOK_STAGE}/usr/share/timidity/timidity.cfg"
 """
 
 [package]
 dependencies = [
     "generaluser-gs",
-]
+]

recipes/terminal/bash-completion/recipe.toml

@@ -6,6 +6,7 @@ b3sum = "5d6725f3baea16467f9a360dde24fb1b9ed1cd3c4e9eb7a3b959d94864a98429"
 template = "configure"
 configureflags = [
     "--prefix=/",
+    "--datarootdir=/usr/share",
 ]
 
 [package]