From 4a94520f2e6eb55f9d651321b15ed638404a66bb Mon Sep 17 00:00:00 2001
From: Ken Moore <moorekou@gmail.com>
Date: Mon, 11 Jan 2016 15:51:52 -0500
Subject: Large cleanup of the Lumina project files and OS-detection/support
 systems. 1) Setup all the subprojects to use the new OS-detect.pri subfile 2)
 Automatically detect/set the build datetime string for the project when qmake
 is run. 3) Automatically read/embed the current GIT revision into the Lumina
 version string 4) Remove the old QtConfig shortcut function from the LuminaOS
 class (and all templates).

---
 lumina-info/lumina-info.pro | 27 ++++++---------------------
 1 file changed, 6 insertions(+), 21 deletions(-)

(limited to 'lumina-info/lumina-info.pro')

diff --git a/lumina-info/lumina-info.pro b/lumina-info/lumina-info.pro
index 0b6ae18d..9ace3f86 100644
--- a/lumina-info/lumina-info.pro
+++ b/lumina-info/lumina-info.pro
@@ -1,16 +1,10 @@
+include("$${PWD}/../OS-detect.pri")
 
 QT       += core gui widgets network
 
 
 TARGET = lumina-info
-isEmpty(PREFIX) {
- PREFIX = /usr/local
-}
-target.path = $$PREFIX/bin
-
-isEmpty(LIBPREFIX) {
- LIBPREFIX = $$DESTDIR$$PREFIX/lib
-}
+target.path = $${DESTDIR}$${L_BINDIR}
 
 TEMPLATE = app
 
@@ -23,17 +17,8 @@ FORMS    += MainUI.ui
 
 RESOURCES+= lumina-info.qrc
 
-INCLUDEPATH += ../libLumina $$PREFIX/include
-
-LIBS     += -L../libLumina -L$$LIBPREFIX -lLuminaUtils
-
-isEmpty(QT5LIBDIR) {
- QT5LIBDIR = $$PREFIX/lib/qt5
-}
-
-LRELEASE = $$QT5LIBDIR/bin/lrelease
+LIBS     += -lLuminaUtils
 
-QMAKE_LIBDIR	= ../libLumina
 DEPENDPATH	+= ../libLumina
 
 TRANSLATIONS =  i18n/lumina-info_af.ts \
@@ -99,11 +84,11 @@ TRANSLATIONS =  i18n/lumina-info_af.ts \
                 i18n/lumina-info_zh_TW.ts \
                 i18n/lumina-info_zu.ts
 
-dotrans.path=$$PREFIX/share/Lumina-DE/i18n/
-dotrans.extra=cd i18n && $${LRELEASE} -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)$$PREFIX/share/Lumina-DE/i18n/
+dotrans.path=$${L_SHAREDIR}/Lumina-DE/i18n/
+dotrans.extra=cd i18n && $${LRELEASE} -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)$${L_SHAREDIR}/Lumina-DE/i18n/
 
 desktop.files=lumina-info.desktop lumina-support.desktop
-desktop.path=$$PREFIX/share/applications/
+desktop.path=$${L_SHAREDIR}/applications/
 
 INSTALLS += target dotrans desktop
 
-- 
cgit