From 9424f542845b74b44461703f4a39af1919184507 Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Mon, 18 Jan 2016 13:20:01 -0500 Subject: Adjust the Linux/Fedora build options a bit: Now Linux systems will use /usr for the PREFIX by default, (except Fedora: /usr/local there) --- OS-detect.pri | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/OS-detect.pri b/OS-detect.pri index 99e60f04..1422130c 100644 --- a/OS-detect.pri +++ b/OS-detect.pri @@ -54,6 +54,8 @@ L_SESSDIR=/usr/share/xsessions OS=Linux LIBS += -L/usr/local/lib -L/usr/lib -L/lib + PREFIX = /usr + exists(/bin/lsb_release){ LINUX_DISTRO = $$system(lsb_release -si) } else:exists(/usr/bin/lsb_release){ @@ -63,12 +65,14 @@ #Now switch through known Linux distro templates equals(LINUX_DISTRO, "Fedora"){ PREFIX=/usr/local - L_LIBDIR=/lib64 + equals($${QMAKE_HOST.arch},"amd64"){ L_LIBDIR=/lib64 } + else{ L_LIBDIR=/lib } } }else{ OS="Unknown"; } + MSG="Build Settings Loaded: $${OS}" equals(OS,"Linux"){ MSG+="-$${LINUX_DISTRO}" } message( $$MSG ) -- cgit