diff --git a/qb/config.libs.sh b/qb/config.libs.sh index 3a5a1f35c33e..b5e18d984297 100644 --- a/qb/config.libs.sh +++ b/qb/config.libs.sh @@ -10,15 +10,10 @@ add_define MAKEFILE NOUNUSED_VARIABLE "$HAVE_NOUNUSED_VARIABLE" [ -z "$CROSS_COMPILE" ] && [ -d /opt/local/lib ] && add_dirs LIBRARY /opt/local/lib [ "$GLOBAL_CONFIG_DIR" ] || \ -{ - if [ "$OS" = 'Haiku' ]; then - GLOBAL_CONFIG_DIR="$PREFIX"/settings - else - case "$PREFIX" in - /usr*) GLOBAL_CONFIG_DIR=/etc ;; - *) GLOBAL_CONFIG_DIR="$PREFIX"/etc ;; - esac - fi +{ case "$PREFIX" in + /usr*) GLOBAL_CONFIG_DIR=/etc ;; + *) GLOBAL_CONFIG_DIR="$PREFIX"/etc ;; + esac } DYLIB=-ldl; @@ -162,16 +157,9 @@ fi add_define MAKEFILE libretro "$LIBRETRO" } - -if [ "$OS" = 'Haiku' ]; then -add_define MAKEFILE ASSETS_DIR "${ASSETS_DIR:-${PREFIX}/data}" -add_define MAKEFILE MAN_DIR "${MAN_DIR:-${PREFIX}/documentation/man}" -else add_define MAKEFILE ASSETS_DIR "${ASSETS_DIR:-${PREFIX}/share}" -add_define MAKEFILE MAN_DIR "${MAN_DIR:-${PREFIX}/share/man}" -fi - add_define MAKEFILE BIN_DIR "${BIN_DIR:-${PREFIX}/bin}" +add_define MAKEFILE MAN_DIR "${MAN_DIR:-${PREFIX}/share/man}" if [ "$OS" = 'DOS' ]; then HAVE_SHADERPIPELINE=no diff --git a/qb/qb.libs.sh b/qb/qb.libs.sh index da64a8b330b3..c259f6e128a1 100644 --- a/qb/qb.libs.sh +++ b/qb/qb.libs.sh @@ -1,11 +1,7 @@ MAKEFILE_DEFINES='' CONFIG_DEFINES='' -if [ "$OS" = 'Haiku' ]; then - [ "$PREFIX" ] || PREFIX="/boot/home/config/non-packaged" -else - [ "$PREFIX" ] || PREFIX="/usr/local" -fi +[ "$PREFIX" ] || PREFIX="/usr/local" add_define() # $1 = MAKEFILE or CONFIG $2 = define $3 = value { eval "${1}_DEFINES=\"\${${1}_DEFINES} $2=$3\""; }