Merge pull request #5794 from orbea/config

qb: Set configure paths without unset variables.
This commit is contained in:
Twinaphex 2017-11-26 21:45:38 +01:00 committed by GitHub
commit fc9f1a42e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -150,14 +150,9 @@ fi
add_define MAKEFILE libretro "$LIBRETRO"
}
[ -z "$ASSETS_DIR" ] && ASSETS_DIR="${PREFIX}/share"
add_define MAKEFILE ASSETS_DIR "$ASSETS_DIR"
[ -z "$BIN_DIR" ] && BIN_DIR="${PREFIX}/bin"
add_define MAKEFILE BIN_DIR "$BIN_DIR"
[ -z "$MAN_DIR" ] && MAN_DIR="${PREFIX}/share/man"
add_define MAKEFILE MAN_DIR "$MAN_DIR"
add_define MAKEFILE ASSETS_DIR "${ASSETS_DIR:-${PREFIX}/share}"
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