From 52a254dea38c0a984f3964b974931eb7db5c55df Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Thu, 18 Aug 2016 15:48:48 -0400 Subject: Oops - NOW the OS-detect.pri file is fixed for the LIBPREFIX variable (also commented out the debugging message from earlier). --- src-qt5/OS-detect.pri | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src-qt5') diff --git a/src-qt5/OS-detect.pri b/src-qt5/OS-detect.pri index 238e1b53..0865cdfe 100644 --- a/src-qt5/OS-detect.pri +++ b/src-qt5/OS-detect.pri @@ -31,7 +31,7 @@ isEmpty(OS){ #Setup the default values for build settings (if not explicitly set previously) isEmpty(PREFIX){ PREFIX=/usr/local } isEmpty(LIBPREFIX){ LIBPREFIX=$${PREFIX}/lib } - message("General Settings: PREFIX=$${PREFIX}, LIBPREFIX=$${LIBPREFIX}") + #message("General Settings: PREFIX=$${PREFIX}, LIBPREFIX=$${LIBPREFIX}") #Now go through and setup any known OS build settings # which are different from the defaults equals(QMAKE_HOST.os, "DragonFly"){ @@ -80,7 +80,7 @@ isEmpty(OS){ # If the detailed install variables are not set - create them from the general vars isEmpty(L_BINDIR){ L_BINDIR = $${PREFIX}/bin } - isEmpty(L_LIBDIR){ L_LIBDIR = $${PREFIX}/lib } + isEmpty(L_LIBDIR){ L_LIBDIR = $${LIBPREFIX} } isEmpty(L_ETCDIR){ L_ETCDIR = $${PREFIX}/etc } isEmpty(L_SHAREDIR){ L_SHAREDIR = $${PREFIX}/share } isEmpty(L_INCLUDEDIR){ L_INCLUDEDIR = $${PREFIX}/include } -- cgit