diff options
| author | Christopher Roy Bratusek <nano@jpberlin.de> | 2016-03-01 20:16:37 +0100 |
|---|---|---|
| committer | Christopher Roy Bratusek <nano@jpberlin.de> | 2016-03-01 20:16:37 +0100 |
| commit | cce2f0ecbd43a7bd37b039b1733cb98e53f39938 (patch) | |
| tree | 81758d1ad65ad5a4b8682c556b9575d619378285 | |
| parent | Remove the "Terminal" and "StartupNotify" entries within the lumina-supprot.d... (diff) | |
| download | lumina-cce2f0ecbd43a7bd37b039b1733cb98e53f39938.tar.gz lumina-cce2f0ecbd43a7bd37b039b1733cb98e53f39938.tar.bz2 lumina-cce2f0ecbd43a7bd37b039b1733cb98e53f39938.zip | |
fixup OS-detect.pri so that externally passed variables from qmake actually take effect
| -rw-r--r-- | OS-detect.pri | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/OS-detect.pri b/OS-detect.pri index ccf1a8b6..6d45bf3a 100644 --- a/OS-detect.pri +++ b/OS-detect.pri @@ -24,8 +24,8 @@ INCLUDEPATH = $${PWD}/libLumina $$[QT_INSTALL_HEADERS] $$[QT_INSTALL_PREFIX] #Setup the default values for build settings (if not explicitly set previously) - !defined(PREFIX){ PREFIX=/usr/local } - !defined(LIBPREFIX){ LIBPREFIX=$${PREFIX}/lib } + isEmpty(PREFIX){ PREFIX=/usr/local } + isEmpty(LIBPREFIX){ LIBPREFIX=$${PREFIX}/lib } #Now go through and setup any known OS build settings # which are different from the defaults @@ -83,13 +83,13 @@ INCLUDEPATH +=$${PREFIX}/include # If the detailed install variables are not set - create them from the general vars - !defined(L_BINDIR){ L_BINDIR = $${PREFIX}/bin } - !defined(L_LIBDIR){ L_LIBDIR = $${PREFIX}/lib } - !defined(L_ETCDIR){ L_ETCDIR = $${PREFIX}/etc } - !defined(L_SHAREDIR){ L_SHAREDIR = $${PREFIX}/share } - !defined(L_INCLUDEDIR){ L_INCLUDEDIR = $${PREFIX}/include } - !defined(L_SESSDIR){ L_SESSDIR = $${L_SHAREDIR}/xsessions } - !defined(LRELEASE){ LRELEASE = $$[QT_INSTALL_BINS]/lrelease } + isEmpty(L_BINDIR){ L_BINDIR = $${PREFIX}/bin } + isEmpty(L_LIBDIR){ L_LIBDIR = $${PREFIX}/lib } + isEmpty(L_ETCDIR){ L_ETCDIR = $${PREFIX}/etc } + isEmpty(L_SHAREDIR){ L_SHAREDIR = $${PREFIX}/share } + isEmpty(L_INCLUDEDIR){ L_INCLUDEDIR = $${PREFIX}/include } + isEmpty(L_SESSDIR){ L_SESSDIR = $${L_SHAREDIR}/xsessions } + isEmpty(LRELEASE){ LRELEASE = $$[QT_INSTALL_BINS]/lrelease } !exists(LRELEASE){ NO_I18N=true } #translations unavailable #Now convert any of these path variables into defines for C++ usage |