aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--OS-detect.pri21
-rw-r--r--libLumina/libLumina.pro2
-rw-r--r--lumina-config/lumina-config.pro2
-rw-r--r--lumina-desktop/lumina-desktop.pro2
-rw-r--r--lumina-fileinfo/lumina-fileinfo.pro2
-rw-r--r--lumina-fm/lumina-fm.pro2
-rw-r--r--lumina-info/lumina-info.pro2
-rw-r--r--lumina-open/lumina-open.pro2
-rw-r--r--lumina-screenshot/lumina-screenshot.pro2
-rw-r--r--lumina-search/lumina-search.pro2
-rw-r--r--lumina-wm-INCOMPLETE/lumina-wm.pro2
-rw-r--r--lumina-xconfig/lumina-xconfig.pro2
12 files changed, 28 insertions, 15 deletions
diff --git a/OS-detect.pri b/OS-detect.pri
index 2f9b0638..45b0ead4 100644
--- a/OS-detect.pri
+++ b/OS-detect.pri
@@ -5,6 +5,9 @@
# Main Build Variables (generally for finding existing files):
# PREFIX: Base install directory (${PREFIX}/[bin/share/etc/include] will be used)
# LIBPREFIX: Base install directory for libraries (usually ${PREFIX}/lib)
+# Automated build variables (for pkg builders and such)
+# DESTDIR: Prepended to the install location of all files (such as a temporary working directory)
+# - Note that the Lumina will probably not run properly from this dir (not final install dir)
# Detailed Build Variables for installing files:
# L_BINDIR: Directory to install binaries
# L_LIBDIR: Directory to install Libraries
@@ -16,12 +19,13 @@
# =============================================
# Note: Make sure the OS variable matches the name of a libLumina/LuminaOS-<OS>.cpp file
# =============================================
-!defined(OS){
+isEmpty(OS){
message("Build OS Info: $${QMAKE_HOST.os}, $${QMAKE_HOST.arch}, $${QMAKE_HOST.version_string}")
#Load the initial library/includefile search locations (more can be added in the OS-specific sections below)
LIBS = -L$${PWD}/libLumina -L$$[QT_INSTALL_LIBS]
INCLUDEPATH = $${PWD}/libLumina $$[QT_INSTALL_HEADERS] $$[QT_INSTALL_PREFIX]
+ QMAKE_LIBDIR = $${PWD}/libLumina $$[QT_INSTALL_LIBS] $$LIBPREFIX/qt5 $$LIBPREFIX
#Setup the default values for build settings (if not explicitly set previously)
isEmpty(PREFIX){ PREFIX=/usr/local }
@@ -47,7 +51,6 @@
}else : netbsd-*{
OS = NetBSD
LIBS += -L/usr/local/lib -L/usr/lib
- LIBPREFIX=/usr/local/lib
#Use the defaults for everything else
}else : linux-*{
@@ -70,7 +73,6 @@
message( $$MSG )
# Setup the dirs needed to find/load libraries
- QMAKE_LIBDIR = $${PWD}/libLumina $$[QT_INSTALL_LIBS] $$LIBPREFIX/qt5 $$LIBPREFIX
INCLUDEPATH +=$${PREFIX}/include
# If the detailed install variables are not set - create them from the general vars
@@ -83,8 +85,19 @@
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
+
+ #Now convert any of these install path variables into defines for C++ usage
DEFINES += PREFIX="QString\\\(\\\"$${PREFIX}\\\"\\\)"
DEFINES += L_ETCDIR="QString\\\(\\\"$${L_ETCDIR}\\\"\\\)"
DEFINES += L_SHAREDIR="QString\\\(\\\"$${L_SHAREDIR}\\\"\\\)"
+
+ #If this is being installed to a temporary directory, change the paths where things get placed
+ !isEmpty(DESTDIR){
+ L_BINDIR = $$DESTDIR$${L_BINDIR}
+ L_LIBDIR = $$DESTDIR$${L_LIBDIR}
+ L_ETCDIR = $$DESTDIR$${L_ETCDIR}
+ L_SHAREDIR = $$DESTDIR$${L_SHAREDIR}
+ L_INCLUDEDIR = $$DESTDIR$${L_INCLUDEDIR}
+ L_SESSDIR = $$DESTDIR$${L_SESSDIR}
+ }
}
diff --git a/libLumina/libLumina.pro b/libLumina/libLumina.pro
index d6de3f06..574b44ff 100644
--- a/libLumina/libLumina.pro
+++ b/libLumina/libLumina.pro
@@ -13,7 +13,7 @@ DEFINES += BUILD_DATE='"\\\"$$system(date)\\\""'
TARGET=LuminaUtils
-target.path = $${DESTDIR}$${L_LIBDIR}
+target.path = $${L_LIBDIR}
DESTDIR= $$_PRO_FILE_PWD_/
diff --git a/lumina-config/lumina-config.pro b/lumina-config/lumina-config.pro
index 04e15d7a..69abd51f 100644
--- a/lumina-config/lumina-config.pro
+++ b/lumina-config/lumina-config.pro
@@ -6,7 +6,7 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets x11extras network
TARGET = lumina-config
-target.path = $$DESTDIR$${L_BINDIR}
+target.path = $${L_BINDIR}
TEMPLATE = app
diff --git a/lumina-desktop/lumina-desktop.pro b/lumina-desktop/lumina-desktop.pro
index b0abea5c..81e144fd 100644
--- a/lumina-desktop/lumina-desktop.pro
+++ b/lumina-desktop/lumina-desktop.pro
@@ -5,7 +5,7 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets x11extras multimedia concurrent
TARGET = Lumina-DE
-target.path = $$DESTDIR$${L_BINDIR}
+target.path = $${L_BINDIR}
LIBS += -lLuminaUtils -lxcb -lxcb-damage
diff --git a/lumina-fileinfo/lumina-fileinfo.pro b/lumina-fileinfo/lumina-fileinfo.pro
index 4f5afcd6..55ebe211 100644
--- a/lumina-fileinfo/lumina-fileinfo.pro
+++ b/lumina-fileinfo/lumina-fileinfo.pro
@@ -7,7 +7,7 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets concurrent
TARGET = lumina-fileinfo
TEMPLATE = app
-target.path = $$DESTDIR$${L_BINDIR}
+target.path = $${L_BINDIR}
SOURCES += main.cpp\
MainUI.cpp
diff --git a/lumina-fm/lumina-fm.pro b/lumina-fm/lumina-fm.pro
index 56077612..6b722900 100644
--- a/lumina-fm/lumina-fm.pro
+++ b/lumina-fm/lumina-fm.pro
@@ -5,7 +5,7 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets multimedia multimediawidgets net
TARGET = lumina-fm
-target.path = $$DESTDIR$${L_BINDIR}
+target.path = $${L_BINDIR}
TEMPLATE = app
diff --git a/lumina-info/lumina-info.pro b/lumina-info/lumina-info.pro
index 9ace3f86..5c98de8f 100644
--- a/lumina-info/lumina-info.pro
+++ b/lumina-info/lumina-info.pro
@@ -4,7 +4,7 @@ QT += core gui widgets network
TARGET = lumina-info
-target.path = $${DESTDIR}$${L_BINDIR}
+target.path = $${L_BINDIR}
TEMPLATE = app
diff --git a/lumina-open/lumina-open.pro b/lumina-open/lumina-open.pro
index 70d4c88f..489331e5 100644
--- a/lumina-open/lumina-open.pro
+++ b/lumina-open/lumina-open.pro
@@ -5,7 +5,7 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets x11extras
TARGET = lumina-open
-target.path = $$DESTDIR$${L_BINDIR}
+target.path = $${L_BINDIR}
TEMPLATE = app
diff --git a/lumina-screenshot/lumina-screenshot.pro b/lumina-screenshot/lumina-screenshot.pro
index 56c2219b..fc9b38c7 100644
--- a/lumina-screenshot/lumina-screenshot.pro
+++ b/lumina-screenshot/lumina-screenshot.pro
@@ -5,7 +5,7 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets x11extras
TARGET = lumina-screenshot
-target.path = $$DESTDIR$${L_BINDIR}
+target.path = $${L_BINDIR}
TEMPLATE = app
diff --git a/lumina-search/lumina-search.pro b/lumina-search/lumina-search.pro
index bd894a6d..d4171f7f 100644
--- a/lumina-search/lumina-search.pro
+++ b/lumina-search/lumina-search.pro
@@ -5,7 +5,7 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
TARGET = lumina-search
-target.path = $$DESTDIR$${L_BINDIR}
+target.path = $${L_BINDIR}
TEMPLATE = app
diff --git a/lumina-wm-INCOMPLETE/lumina-wm.pro b/lumina-wm-INCOMPLETE/lumina-wm.pro
index a1a4d2f8..0fb27d39 100644
--- a/lumina-wm-INCOMPLETE/lumina-wm.pro
+++ b/lumina-wm-INCOMPLETE/lumina-wm.pro
@@ -4,7 +4,7 @@ QT += core gui network
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets x11extras
TARGET = lumina-wm
-target.path = $$DESTDIR$$PREFIX/bin
+target.path = $$PREFIX/bin
LIBS += -lLuminaUtils -lxcb -lxcb-damage -lxcb-composite -lxcb-screensaver -lxcb-util
diff --git a/lumina-xconfig/lumina-xconfig.pro b/lumina-xconfig/lumina-xconfig.pro
index 4900291b..f9463445 100644
--- a/lumina-xconfig/lumina-xconfig.pro
+++ b/lumina-xconfig/lumina-xconfig.pro
@@ -4,7 +4,7 @@ QT += core gui
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets network
TARGET = lumina-xconfig
-target.path = $$DESTDIR$${L_BINDIR}
+target.path = $${L_BINDIR}
TEMPLATE = app
bgstack15