diff --git a/Makefile b/Makefile index db58e9059c..058a923b19 100644 --- a/Makefile +++ b/Makefile @@ -13,10 +13,6 @@ TARGET = retroarch OBJDIR := obj-unix -ifeq ($(GLOBAL_CONFIG_DIR),) - GLOBAL_CONFIG_DIR = /etc -endif - OBJ := LIBS := DEFINES := -DHAVE_CONFIG_H -DRARCH_INTERNAL -DHAVE_OVERLAY diff --git a/qb/config.libs.sh b/qb/config.libs.sh index 271d57d6af..d430a75bd9 100644 --- a/qb/config.libs.sh +++ b/qb/config.libs.sh @@ -10,6 +10,13 @@ add_define_make NOUNUSED_VARIABLE "$HAVE_NOUNUSED_VARIABLE" [ -z "$CROSS_COMPILE" ] && [ -d /opt/local/lib ] && add_library_dirs /opt/local/lib +[ "$GLOBAL_CONFIG_DIR" ] || \ +{ case "$PREFIX" in + /usr*) GLOBAL_CONFIG_DIR=/etc ;; + *) GLOBAL_CONFIG_DIR="$PREFIX"/etc ;; + esac +} + DYLIB=-ldl; CLIB=-lc PTHREADLIB=-lpthread