diff options
| author | Ken Moore <moorekou@gmail.com> | 2016-08-18 15:48:48 -0400 |
|---|---|---|
| committer | Ken Moore <moorekou@gmail.com> | 2016-08-18 15:48:48 -0400 |
| commit | 52a254dea38c0a984f3964b974931eb7db5c55df (patch) | |
| tree | 109a017565f6c5decdb76d80ba62c9392be8f063 /src-qt5 | |
| parent | Fix a bug in the OS-detect.pri file where the LIBPREFIX was not getting used ... (diff) | |
| download | lumina-52a254dea38c0a984f3964b974931eb7db5c55df.tar.gz lumina-52a254dea38c0a984f3964b974931eb7db5c55df.tar.bz2 lumina-52a254dea38c0a984f3964b974931eb7db5c55df.zip | |
Oops - NOW the OS-detect.pri file is fixed for the LIBPREFIX variable (also commented out the debugging message from earlier).
Diffstat (limited to 'src-qt5')
| -rw-r--r-- | src-qt5/OS-detect.pri | 4 |
1 files changed, 2 insertions, 2 deletions
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 } |