diff options
29 files changed, 173 insertions, 323 deletions
diff --git a/OS-detect.pri b/OS-detect.pri index d334476d..99e60f04 100644 --- a/OS-detect.pri +++ b/OS-detect.pri @@ -2,31 +2,58 @@ # Subroutine for project files to detect which OS is compiling the project # Generic variables it sets for internal use: OS, LINUX_DISTRO (if OS=="Linux") # ============================================= -# Main Build Variables: +# 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) -# QTLIBDIR: Directory where the Qt libraries are currently installed -# +# LIBPREFIX: Base install directory for libraries (usually ${PREFIX}/lib) +# Detailed Build Variables for installing files: +# L_BINDIR: Directory to install binaries +# L_LIBDIR: Directory to install Libraries +# L_ETCDIR: Directory to install/use global configs +# L_SHAREDIR: Directory to install the general Lumina files +# L_INCLUDEDIR: Directory to install include files +# L_SESSDIR: Directory to place *.desktop file for starting the Lumina session +# LRELEASE: binary path to the Qt lrelease utility (usually auto-set) # ============================================= # Note: Make sure the OS variable matches the name of a libLumina/LuminaOS-<OS>.cpp file # ============================================= !defined(OS){ message("Build OS Info: $${QMAKE_HOST.os}, $${QMAKE_HOST.arch}, $${QMAKE_HOST.version_string}") - OS=$$QMAKE_HOST.os + #Load the initial library search locations (more can be added in the OS-specific sections below) + LIBS = -L$${PWD}/libLumina -L$$[QT_INSTALL_LIBS] + #Setup the default values for build settings (if not explicitly set previously) - !defined(PREFIX){ PREFIX=/usr/local/ } + !defined(PREFIX){ PREFIX=/usr/local } !defined(LIBPREFIX){ LIBPREFIX=$${PREFIX}/lib } - !defined(QTLIBDIR){ QTLIBDIR=$${LIBPREFIX}/qt5 } #Now go through and setup any known OS build settings # which are different from the defaults - equals(OS, "NetBSD"){ + equals(QMAKE_HOST.os, "DragonFly"){ + #Note: DragonFly BSD gets detected as FreeBSD with compiler flags ? + OS = DragonFly + LIBS += -L/usr/local/lib -L/usr/lib + + }else : freebsd-*{ + OS = FreeBSD + LIBS += -L/usr/local/lib -L/usr/lib + #Use the defaults for everything else + + }else : openbsd-*{ + OS = OpenBSD + LIBS += -L/usr/local/lib -L/usr/lib + #Use the defaults for everything else + + }else : netbsd-*{ + OS = NetBSD + LIBS += -L/usr/local/lib -L/usr/lib PREFIX=/usr/local LIBPREFIX=/usr/local/lib - QTLIBDIR=/usr/local/lib/qt5 - }else:contains(OS, "Linux"){ + #Use the defaults for everything else + + }else : linux-*{ + L_SESSDIR=/usr/share/xsessions OS=Linux + LIBS += -L/usr/local/lib -L/usr/lib -L/lib exists(/bin/lsb_release){ LINUX_DISTRO = $$system(lsb_release -si) } else:exists(/usr/bin/lsb_release){ @@ -36,15 +63,32 @@ #Now switch through known Linux distro templates equals(LINUX_DISTRO, "Fedora"){ PREFIX=/usr/local - LIBPREFIX=/lib64 - QTLIBDIR=/lib/qt5 - + L_LIBDIR=/lib64 } + }else{ + OS="Unknown"; } MSG="Build Settings Loaded: $${OS}" equals(OS,"Linux"){ MSG+="-$${LINUX_DISTRO}" } message( $$MSG ) - #now remove the temporary MSG variable + # Setup the dirs needed to find/load libraries + QMAKE_LIBDIR = $$[QT_INSTALL_LIBS] $$LIBPREFIX/qt5 $$LIBPREFIX + INCLUDEPATH = $${PWD}/libLumina $$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 } + + !exists(LRELEASE){ NO_I18N=true } #translations unavailable + #Now convert any of these path variables into defines for C++ usage + DEFINES += PREFIX="QString\\\(\\\"$${PREFIX}\\\"\\\)" + DEFINES += L_ETCDIR="QString\\\(\\\"$${L_ETCDIR}\\\"\\\)" + DEFINES += L_SHAREDIR="QString\\\(\\\"$${L_SHAREDIR}\\\"\\\)" }
\ No newline at end of file diff --git a/libLumina/LuminaOS-Debian.cpp b/libLumina/LuminaOS-Debian.cpp index 593e3d24..76b6822e 100644 --- a/libLumina/LuminaOS-Debian.cpp +++ b/libLumina/LuminaOS-Debian.cpp @@ -22,7 +22,6 @@ QString LOS::SysPrefix(){ return "/"; } //Prefix for system //OS-specific application shortcuts (*.desktop files) QString LOS::ControlPanelShortcut(){ return ""; } //system control panel QString LOS::AppStoreShortcut(){ return LOS::AppPrefix() + "/share/applications/synaptic.desktop"; } //graphical app/pkg manager -QString LOS::QtConfigShortcut(){ return LOS::AppPrefix() + "/bin/qt5ct"; } //qtconfig binary (NOT *.desktop file) // ==== ExternalDevicePaths() ==== QStringList LOS::ExternalDevicePaths(){ diff --git a/libLumina/LuminaOS-DragonFly.cpp b/libLumina/LuminaOS-DragonFly.cpp index 35ff49ae..fb2c2241 100644 --- a/libLumina/LuminaOS-DragonFly.cpp +++ b/libLumina/LuminaOS-DragonFly.cpp @@ -72,7 +72,6 @@ QString LOS::SysPrefix(){ return "/usr/"; } //Prefix for system //OS-specific application shortcuts (*.desktop files) QString LOS::ControlPanelShortcut(){ return ""; } //system control panel QString LOS::AppStoreShortcut(){ return ""; } //graphical app/pkg manager -QString LOS::QtConfigShortcut(){ return "/usr/local/bin/qtconfig-qt4"; } //qtconfig binary (NOT *.desktop file) // ==== ExternalDevicePaths() ==== QStringList LOS::ExternalDevicePaths(){ diff --git a/libLumina/LuminaOS-FreeBSD.cpp b/libLumina/LuminaOS-FreeBSD.cpp index 99d20781..310341f6 100644 --- a/libLumina/LuminaOS-FreeBSD.cpp +++ b/libLumina/LuminaOS-FreeBSD.cpp @@ -24,7 +24,6 @@ QString LOS::SysPrefix(){ return "/usr/"; } //Prefix for system //OS-specific application shortcuts (*.desktop files) QString LOS::ControlPanelShortcut(){ return "/usr/local/share/applications/pccontrol.desktop"; } //system control panel QString LOS::AppStoreShortcut(){ return "/usr/local/share/applications/softmanager.desktop"; } //graphical app/pkg manager -QString LOS::QtConfigShortcut(){ return ""; } //qtconfig binary (NOT *.desktop file) // ==== ExternalDevicePaths() ==== QStringList LOS::ExternalDevicePaths(){ diff --git a/libLumina/LuminaOS-Linux.cpp b/libLumina/LuminaOS-Linux.cpp index 1fc98489..7d618b14 100644 --- a/libLumina/LuminaOS-Linux.cpp +++ b/libLumina/LuminaOS-Linux.cpp @@ -22,7 +22,6 @@ QString LOS::SysPrefix(){ return "/usr/"; } //Prefix for system //OS-specific application shortcuts (*.desktop files) QString LOS::ControlPanelShortcut(){ return ""; } //system control panel QString LOS::AppStoreShortcut(){ return ""; } //graphical app/pkg manager -QString LOS::QtConfigShortcut(){ return LOS::AppPrefix() + "/bin/qtconfig-qt4"; } //qtconfig binary (NOT *.desktop file) // ==== ExternalDevicePaths() ==== QStringList LOS::ExternalDevicePaths(){ diff --git a/libLumina/LuminaOS-NetBSD.cpp b/libLumina/LuminaOS-NetBSD.cpp index f87d7a2a..c3b4b3a2 100644 --- a/libLumina/LuminaOS-NetBSD.cpp +++ b/libLumina/LuminaOS-NetBSD.cpp @@ -18,7 +18,6 @@ QString LOS::SysPrefix(){ return "/usr/"; } //Prefix for system //OS-specific application shortcuts (*.desktop files) QString LOS::ControlPanelShortcut(){ return ""; } //system control panel QString LOS::AppStoreShortcut(){ return ""; } //graphical app/pkg manager -QString LOS::QtConfigShortcut(){ return ""; } //qtconfig binary (NOT *.desktop file) // ==== ExternalDevicePaths() ==== QStringList LOS::ExternalDevicePaths(){ diff --git a/libLumina/LuminaOS-OpenBSD.cpp b/libLumina/LuminaOS-OpenBSD.cpp index 33159454..fa715480 100644 --- a/libLumina/LuminaOS-OpenBSD.cpp +++ b/libLumina/LuminaOS-OpenBSD.cpp @@ -21,7 +21,6 @@ QString LOS::SysPrefix(){ return "/usr/"; } //Prefix for system //OS-specific application shortcuts (*.desktop files) QString LOS::ControlPanelShortcut(){ return ""; } //system control panel QString LOS::AppStoreShortcut(){ return ""; } //graphical app/pkg manager -QString LOS::QtConfigShortcut(){ return "/usr/local/bin/qtconfig4"; } //qtconfig binary (NOT *.desktop file) // ==== ExternalDevicePaths() ==== QStringList LOS::ExternalDevicePaths(){ diff --git a/libLumina/LuminaOS-kFreeBSD.cpp b/libLumina/LuminaOS-kFreeBSD.cpp index d651de4d..da0d6fe7 100644 --- a/libLumina/LuminaOS-kFreeBSD.cpp +++ b/libLumina/LuminaOS-kFreeBSD.cpp @@ -26,7 +26,6 @@ QString LOS::SysPrefix(){ return "/usr/"; } //Prefix for system //OS-specific application shortcuts (*.desktop files) QString LOS::ControlPanelShortcut(){ return ""; } //system control panel QString LOS::AppStoreShortcut(){ return ""; } //graphical app/pkg manager -QString LOS::QtConfigShortcut(){ return "/usr/bin/qtconfig-qt4"; } //qtconfig binary (NOT *.desktop file) // ==== ExternalDevicePaths() ==== QStringList LOS::ExternalDevicePaths(){ diff --git a/libLumina/LuminaOS-template.cpp b/libLumina/LuminaOS-template.cpp index ec547d1d..073b9092 100644 --- a/libLumina/LuminaOS-template.cpp +++ b/libLumina/LuminaOS-template.cpp @@ -18,7 +18,6 @@ QString LOS::SysPrefix(){ return "/usr/"; } //Prefix for system //OS-specific application shortcuts (*.desktop files) QString LOS::ControlPanelShortcut(){ return ""; } //system control panel QString LOS::AppStoreShortcut(){ return ""; } //graphical app/pkg manager -QString LOS::QtConfigShortcut(){ return ""; } //qtconfig binary (NOT *.desktop file) // ==== ExternalDevicePaths() ==== QStringList LOS::ExternalDevicePaths(){ diff --git a/libLumina/LuminaOS.h b/libLumina/LuminaOS.h index 5672454b..b211d04a 100644 --- a/libLumina/LuminaOS.h +++ b/libLumina/LuminaOS.h @@ -20,29 +20,20 @@ #include "LuminaUtils.h" -//First try to load the globals.h to set PREFIX -#ifndef PREFIX -#include "global.h" -#endif -//Now use the default value for PREFIX if not set -#ifndef PREFIX -#define PREFIX QString("/usr/local") -#endif - +// NOTE: PREFIX, L_ETCDIR, L_SHAREDIR are defined in the OS-detect.pri project file and passed in class LOS{ public: //Return the name of the OS being used static QString OSName(); //OS-specific prefix(s) - static QString LuminaShare(){ return (PREFIX+"/share/Lumina-DE/"); } //Install dir for Lumina share files + static QString LuminaShare(){ return (L_SHAREDIR+"/Lumina-DE/"); } //Install dir for Lumina share files static QString AppPrefix(); //Prefix for applications (/usr/local/ on FreeBSD) static QString SysPrefix(); //Prefix for system (/usr/ on FreeBSD) //OS-specific application shortcuts (*.desktop files) static QString ControlPanelShortcut(); static QString AppStoreShortcut(); - static QString QtConfigShortcut(); //Scan for mounted external devices static QStringList ExternalDevicePaths(); //Returns: QStringList[<type>::::<filesystem>::::<path>] diff --git a/libLumina/LuminaUtils.cpp b/libLumina/LuminaUtils.cpp index 5f7a057e..a4c2792e 100644 --- a/libLumina/LuminaUtils.cpp +++ b/libLumina/LuminaUtils.cpp @@ -49,7 +49,18 @@ inline QStringList ProcessRun(QString cmd, QStringList args){ // LUtils Functions //============= QString LUtils::LuminaDesktopVersion(){ - return "0.8.8-devel"; + QString ver = "0.8.8-devel"; + #ifdef GIT_VERSION + ver.append( QString(" (Git Revision: %1)").arg(GIT_VERSION) ); + #endif + return ver; +} + +QString LUtils::LuminaDesktopBuildDate(){ + #ifdef BUILD_DATE + return BUILD_DATE; + #endif + return ""; } int LUtils::runCmd(QString cmd, QStringList args){ @@ -548,8 +559,8 @@ void LUtils::LoadSystemDefaults(bool skipOS){ if(sysDefaults.isEmpty() && !skipOS){ sysDefaults = LUtils::readFile(LOS::AppPrefix()+"etc/luminaDesktop.conf.dist"); } if(sysDefaults.isEmpty() && !skipOS) { sysDefaults = LUtils::readFile(LOS::SysPrefix()+"etc/luminaDesktop.conf"); } if(sysDefaults.isEmpty() && !skipOS){ sysDefaults = LUtils::readFile(LOS::SysPrefix()+"etc/luminaDesktop.conf.dist"); } - if(sysDefaults.isEmpty() && !skipOS) { sysDefaults = LUtils::readFile("/etc/luminaDesktop.conf"); } - if(sysDefaults.isEmpty() && !skipOS){ sysDefaults = LUtils::readFile("/etc/luminaDesktop.conf.dist"); } + if(sysDefaults.isEmpty() && !skipOS) { sysDefaults = LUtils::readFile(L_ETCDIR+"/luminaDesktop.conf"); } + if(sysDefaults.isEmpty() && !skipOS){ sysDefaults = LUtils::readFile(L_ETCDIR+"/luminaDesktop.conf.dist"); } if(sysDefaults.isEmpty()){ sysDefaults = LUtils::readFile(LOS::LuminaShare()+"luminaDesktop.conf"); } //Find the number of the left-most desktop screen QString screen = "0"; diff --git a/libLumina/LuminaUtils.h b/libLumina/LuminaUtils.h index 7b35b09d..c4395d79 100644 --- a/libLumina/LuminaUtils.h +++ b/libLumina/LuminaUtils.h @@ -26,9 +26,10 @@ class LUtils{ public: - //Get the current version of the Lumina desktop + //Get the current version/build of the Lumina desktop static QString LuminaDesktopVersion(); - + static QString LuminaDesktopBuildDate(); + //Run an external command and return the exit code static int runCmd(QString cmd, QStringList args = QStringList()); //Run an external command and return any text output (one line per entry) diff --git a/libLumina/LuminaXDG.cpp b/libLumina/LuminaXDG.cpp index c46a96a8..a1754b2f 100644 --- a/libLumina/LuminaXDG.cpp +++ b/libLumina/LuminaXDG.cpp @@ -407,7 +407,8 @@ QStringList LXDG::systemApplicationDirs(){ //Returns a list of all the directories where *.desktop files can be found QStringList appDirs = QString(getenv("XDG_DATA_HOME")).split(":"); appDirs << QString(getenv("XDG_DATA_DIRS")).split(":"); - if(appDirs.isEmpty()){ appDirs << "/usr/local/share" << "/usr/share"; } + if(appDirs.isEmpty()){ appDirs << "/usr/local/share" << "/usr/share" << LOS::AppPrefix()+"/share" << LOS::SysPrefix()+"/share" << L_SHAREDIR; } + appDirs.removeDuplicates(); //Now create a valid list QStringList out; for(int i=0; i<appDirs.length(); i++){ diff --git a/libLumina/libLumina.pro b/libLumina/libLumina.pro index a33ec66d..d6de3f06 100644 --- a/libLumina/libLumina.pro +++ b/libLumina/libLumina.pro @@ -3,12 +3,17 @@ include("$${PWD}/../OS-detect.pri") QT += core network greaterThan(QT_MAJOR_VERSION, 4): QT += widgets x11extras multimedia concurrent svg +define +#Setup any special defines (qmake -> C++) +GIT_VERSION=$$system(git describe --always) +!isEmpty(GIT_VERSION){ + DEFINES += GIT_VERSION='"\\\"$${GIT_VERSION}\\\""' +} +DEFINES += BUILD_DATE='"\\\"$$system(date)\\\""' TARGET=LuminaUtils -system(./make-global-h.sh $$PREFIX) - -target.path = $$DESTDIR$$LIBPREFIX +target.path = $${DESTDIR}$${L_LIBDIR} DESTDIR= $$_PRO_FILE_PWD_/ @@ -28,14 +33,8 @@ SOURCES += LuminaXDG.cpp \ LuminaX11.cpp \ LuminaThemes.cpp \ LuminaSingleApplication.cpp -# LuminaOS-FreeBSD.cpp \ -# LuminaOS-DragonFly.cpp \ -# LuminaOS-NetBSD.cpp \ -# LuminaOS-OpenBSD.cpp \ -# LuminaOS-kFreeBSD.cpp -# new OS support can be added here -# check linux distribution and use specific +# Also load the OS template as available for # LuminaOS support functions (or fall back to generic one) exists($${PWD}/LuminaOS-$${LINUX_DISTRO}.cpp){ SOURCES += LuminaOS-$${LINUX_DISTRO}.cpp @@ -45,11 +44,9 @@ exists($${PWD}/LuminaOS-$${LINUX_DISTRO}.cpp){ SOURCES += LuminaOS-template.cpp } -INCLUDEPATH += $$PREFIX/include - LIBS += -lc -lxcb -lxcb-ewmh -lxcb-icccm -lxcb-image -lxcb-composite -lxcb-damage -lxcb-util -lXdamage -include.path=$$PREFIX/include/ +include.path=$${L_INCLUDEDIR} include.files=LuminaXDG.h \ LuminaUtils.h \ LuminaX11.h \ @@ -57,15 +54,13 @@ include.files=LuminaXDG.h \ LuminaOS.h \ LuminaSingleApplication.h -colors.path=$$PREFIX/share/Lumina-DE/colors/ +colors.path=$${L_SHAREDIR}/Lumina-DE/colors colors.files=colors/*.qss.colors -themes.path=$$PREFIX/share/Lumina-DE/themes/ +themes.path=$${L_SHAREDIR}/Lumina-DE/themes/ themes.files=themes/*.qss.template -quickplugins.path=$$PREFIX/share/Lumina-DE/quickplugins/ +quickplugins.path=$${L_SHAREDIR}/Lumina-DE/quickplugins/ quickplugins.files=quickplugins/* INSTALLS += target include colors themes quickplugins - -QMAKE_LIBDIR = $$LIBPREFIX/qt5 $$LIBPREFIX diff --git a/lumina-checkpass/lumina-checkpass.pro b/lumina-checkpass/lumina-checkpass.pro index 387246d0..ea9311d6 100644 --- a/lumina-checkpass/lumina-checkpass.pro +++ b/lumina-checkpass/lumina-checkpass.pro @@ -1,26 +1,19 @@ +include("$${PWD}/../OS-detect.pri") + TEMPLATE = app #Don't need any Qt - just a simple C program QT = CONFIG += console TARGET = lumina-checkpass -isEmpty(PREFIX) { - PREFIX = /usr/local -} -target.path = $$DESTDIR$$PREFIX/sbin - -isEmpty(LIBPREFIX) { - LIBPREFIX = $$PREFIX/lib -} +target.path = $$DESTDIR$${PREFIX}/sbin -LIBS += -L$$LIBPREFIX -lpam +LIBS += -lpam SOURCES += main.c -INCLUDEPATH += $$PREFIX/include - -perms.path = $$DESTDIR$$PREFIX/sbin -perms.extra = "chmod 4555 $$DESTDIR$$PREFIX/sbin/lumina-checkpass" +perms.path = $$DESTDIR$${PREFIX}/sbin +perms.extra = "chmod 4555 $$DESTDIR$${PREFIX}/sbin/lumina-checkpass" INSTALLS += target perms diff --git a/lumina-config/lumina-config.pro b/lumina-config/lumina-config.pro index df0d6417..04e15d7a 100644 --- a/lumina-config/lumina-config.pro +++ b/lumina-config/lumina-config.pro @@ -1,17 +1,12 @@ +include("$${PWD}/../OS-detect.pri") QT += core gui greaterThan(QT_MAJOR_VERSION, 4): QT += widgets x11extras network TARGET = lumina-config -isEmpty(PREFIX) { - PREFIX = /usr/local -} -target.path = $$DESTDIR$$PREFIX/bin -isEmpty(LIBPREFIX) { - LIBPREFIX = $$PREFIX/lib -} +target.path = $$DESTDIR$${L_BINDIR} TEMPLATE = app @@ -43,18 +38,9 @@ FORMS += mainUI.ui \ # RESOURCES+= lumina-config.qrc -INCLUDEPATH += ../libLumina $$PREFIX/include +LIBS += -lLuminaUtils -LIBS += -L../libLumina -L$$LIBPREFIX -lLuminaUtils -isEmpty(QT5LIBDIR) { - QT5LIBDIR = $$PREFIX/lib/qt5 -} - -LRELEASE = $$QT5LIBDIR/bin/lrelease - - -QMAKE_LIBDIR = ../libLumina DEPENDPATH += ../libLumina TRANSLATIONS = i18n/lumina-config_af.ts \ @@ -120,8 +106,8 @@ TRANSLATIONS = i18n/lumina-config_af.ts \ i18n/lumina-config_zh_TW.ts \ i18n/lumina-config_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/ INSTALLS += target dotrans diff --git a/lumina-desktop/SettingsMenu.cpp b/lumina-desktop/SettingsMenu.cpp index c3e4371f..540538b5 100644 --- a/lumina-desktop/SettingsMenu.cpp +++ b/lumina-desktop/SettingsMenu.cpp @@ -35,12 +35,12 @@ void SettingsMenu::UpdateMenu(){ act = new QAction( LXDG::findIcon("preferences-other",""), tr("Display"), this); act->setWhatsThis("lumina-xconfig"); this->addAction(act); - QString qtconfig = LOS::QtConfigShortcut(); + /*QString qtconfig = LOS::QtConfigShortcut(); if(QFile::exists(qtconfig) && !qtconfig.isEmpty()){ act = new QAction( LXDG::findIcon("preferences-desktop-theme",""), tr("Window Theme"), this); act->setWhatsThis(qtconfig); this->addAction(act); - } + }*/ QString CONTROLPANEL = LOS::ControlPanelShortcut(); if(QFile::exists(CONTROLPANEL) && !CONTROLPANEL.isEmpty()){ //Now load the info diff --git a/lumina-desktop/lumina-desktop.pro b/lumina-desktop/lumina-desktop.pro index 4315b2a5..113bd9cf 100644 --- a/lumina-desktop/lumina-desktop.pro +++ b/lumina-desktop/lumina-desktop.pro @@ -1,30 +1,18 @@ +include($${PWD}/../OS-detect.pri) QT += core gui network greaterThan(QT_MAJOR_VERSION, 4): QT += widgets x11extras multimedia quickwidgets concurrent svg TARGET = Lumina-DE -isEmpty(PREFIX) { - PREFIX = /usr/local -} -target.path = $$DESTDIR$$PREFIX/bin +target.path = $$DESTDIR$${L_BINDIR} -isEmpty(LIBPREFIX) { - LIBPREFIX = $$PREFIX/lib -} -LIBS += -L../libLumina -L$$LIBPREFIX -lLuminaUtils -lxcb -lxcb-damage -QMAKE_LIBDIR = ../libLumina +LIBS += -lLuminaUtils -lxcb -lxcb-damage DEPENDPATH += ../libLumina TEMPLATE = app -isEmpty(QT5LIBDIR) { - QT5LIBDIR = $$PREFIX/lib/qt5 -} - -LRELEASE = $$QT5LIBDIR/bin/lrelease - SOURCES += main.cpp \ WMProcess.cpp \ @@ -68,45 +56,37 @@ include(desktop-plugins/desktop-plugins.pri) RESOURCES+= Lumina-DE.qrc -INCLUDEPATH += ../libLumina $$PREFIX/include - -desktop.files = Lumina-DE.desktop -linux-* { -desktop.path = /usr/share/xsessions -} else { -desktop.path = $$PREFIX/share/xsessions -} +desktop.path = $${L_SESSDIR} icons.files = Lumina-DE.png \ Insight-FileManager.png - -icons.path = $$PREFIX/share/pixmaps +icons.path = $${L_SHAREDIR}/pixmaps fluxconf.files = fluxboxconf/fluxbox-init-rc \ fluxboxconf/fluxbox-keys -fluxconf.path = $$PREFIX/share/Lumina-DE/ +fluxconf.path = $${L_SHAREDIR}/Lumina-DE/ wallpapers.files = wallpapers/Lumina_Wispy_gold.jpg \ wallpapers/Lumina_Wispy_green.jpg \ wallpapers/Lumina_Wispy_purple.jpg \ wallpapers/Lumina_Wispy_red.jpg -wallpapers.path = $$PREFIX/share/wallpapers/Lumina-DE +wallpapers.path = $${L_SHAREDIR}/wallpapers/Lumina-DE defaults.files = defaults/luminaDesktop.conf \ audiofiles/Logout.ogg \ audiofiles/Login.ogg -defaults.path = $$PREFIX/share/Lumina-DE/ +defaults.path = $${L_SHAREDIR}/Lumina-DE/ -conf.path = $$PREFIX/etc +conf.path = $${L_ETCDIR} #Now do any PC-BSD defaults (if set) PCBSD{ - conf.extra = cp defaults/luminaDesktop.pcbsd.conf $(INSTALL_ROOT)$$PREFIX/etc/luminaDesktop.conf.dist - defaults.extra = cp defaults/desktop-background.pcbsd.jpg $(INSTALL_ROOT)$$PREFIX/share/Lumina-DE/desktop-background.jpg + conf.extra = cp defaults/luminaDesktop.pcbsd.conf $(INSTALL_ROOT)$${L_ETCDIR}/luminaDesktop.conf.dist + defaults.extra = cp defaults/desktop-background.pcbsd.jpg $(INSTALL_ROOT)$${L_SHAREDIR}/Lumina-DE/desktop-background.jpg }else{ - conf.extra = cp defaults/luminaDesktop.conf $(INSTALL_ROOT)$$PREFIX/etc/luminaDesktop.conf.dist - defaults.extra = cp defaults/desktop-background.jpg $(INSTALL_ROOT)$$PREFIX/share/Lumina-DE/desktop-background.jpg + conf.extra = cp defaults/luminaDesktop.conf $(INSTALL_ROOT)$${L_ETCDIR}/luminaDesktop.conf.dist + defaults.extra = cp defaults/desktop-background.jpg $(INSTALL_ROOT)$${L_SHAREDIR}/Lumina-DE/desktop-background.jpg } TRANSLATIONS = i18n/lumina-desktop_af.ts \ @@ -172,8 +152,8 @@ TRANSLATIONS = i18n/lumina-desktop_af.ts \ i18n/lumina-desktop_zh_TW.ts \ i18n/lumina-desktop_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/ INSTALLS += target desktop icons wallpapers defaults conf fluxconf dotrans diff --git a/lumina-desktop/panel-plugins/userbutton/UserWidget.cpp b/lumina-desktop/panel-plugins/userbutton/UserWidget.cpp index da115478..f1f9d03e 100644 --- a/lumina-desktop/panel-plugins/userbutton/UserWidget.cpp +++ b/lumina-desktop/panel-plugins/userbutton/UserWidget.cpp @@ -32,7 +32,7 @@ UserWidget::UserWidget(QWidget* parent) : QTabWidget(parent), ui(new Ui::UserWid //Setup the special buttons connect(ui->tool_app_store, SIGNAL(clicked()), this, SLOT(openStore()) ); connect(ui->tool_controlpanel, SIGNAL(clicked()), this, SLOT(openControlPanel()) ); - connect(ui->tool_qtconfig, SIGNAL(clicked()), this, SLOT(openQtConfig()) ); + //connect(ui->tool_qtconfig, SIGNAL(clicked()), this, SLOT(openQtConfig()) ); lastUpdate = QDateTime(); //make sure it refreshes @@ -152,13 +152,13 @@ void UserWidget::UpdateAll(){ }else{ ui->tool_controlpanel->setVisible(false); //not available } - QString QTCONFIG = LOS::QtConfigShortcut(); + /*QString QTCONFIG = LOS::QtConfigShortcut(); if(QFile::exists(QTCONFIG) && !QTCONFIG.isEmpty()){ ui->tool_qtconfig->setVisible(true); ui->tool_qtconfig->setIcon( LXDG::findIcon("preferences-desktop-theme","") ); }else{ ui->tool_qtconfig->setVisible(false); - } + }*/ //Now update the menus UpdateMenu(); } diff --git a/lumina-desktop/panel-plugins/userbutton/UserWidget.h b/lumina-desktop/panel-plugins/userbutton/UserWidget.h index f2e8f6d8..af9408dd 100644 --- a/lumina-desktop/panel-plugins/userbutton/UserWidget.h +++ b/lumina-desktop/panel-plugins/userbutton/UserWidget.h @@ -80,9 +80,6 @@ private slots: void openDeskSettings(){ LaunchItem("lumina-config", false); } - void openQtConfig(){ - LaunchItem( LOS::QtConfigShortcut(), false); - } void openScreenSaverConfig(){ LaunchItem(SSAVER, false); } diff --git a/lumina-desktop/panel-plugins/userbutton/UserWidget.ui b/lumina-desktop/panel-plugins/userbutton/UserWidget.ui index 53eb1f94..9ef5af7e 100644 --- a/lumina-desktop/panel-plugins/userbutton/UserWidget.ui +++ b/lumina-desktop/panel-plugins/userbutton/UserWidget.ui @@ -6,7 +6,7 @@ <rect> <x>0</x> <y>0</y> - <width>292</width> + <width>294</width> <height>289</height> </rect> </property> @@ -276,8 +276,8 @@ <rect> <x>0</x> <y>0</y> - <width>259</width> - <height>247</height> + <width>98</width> + <height>28</height> </rect> </property> </widget> @@ -444,8 +444,8 @@ <rect> <x>0</x> <y>0</y> - <width>259</width> - <height>247</height> + <width>98</width> + <height>28</height> </rect> </property> </widget> @@ -528,28 +528,6 @@ </widget> </item> <item> - <widget class="QToolButton" name="tool_qtconfig"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>Application Appearance</string> - </property> - <property name="iconSize"> - <size> - <width>20</width> - <height>20</height> - </size> - </property> - <property name="toolButtonStyle"> - <enum>Qt::ToolButtonTextBesideIcon</enum> - </property> - </widget> - </item> - <item> <widget class="QToolButton" name="tool_config_screensaver"> <property name="sizePolicy"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> diff --git a/lumina-fileinfo/lumina-fileinfo.pro b/lumina-fileinfo/lumina-fileinfo.pro index 34e01717..4f5afcd6 100644 --- a/lumina-fileinfo/lumina-fileinfo.pro +++ b/lumina-fileinfo/lumina-fileinfo.pro @@ -1,3 +1,5 @@ +include("$${PWD}/../OS-detect.pri") + QT += core gui greaterThan(QT_MAJOR_VERSION, 4): QT += widgets concurrent @@ -5,15 +7,7 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets concurrent TARGET = lumina-fileinfo TEMPLATE = app -isEmpty(PREFIX) { - PREFIX = /usr/local -} -target.path = $$DESTDIR$$PREFIX/bin - -isEmpty(LIBPREFIX) { - LIBPREFIX = $$PREFIX/lib -} - +target.path = $$DESTDIR$${L_BINDIR} SOURCES += main.cpp\ MainUI.cpp @@ -24,18 +18,8 @@ FORMS += MainUI.ui #RESOURCES+= lumina-fileinfo.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 @@ -102,8 +86,8 @@ TRANSLATIONS = i18n/lumina-fileinfo_af.ts \ i18n/lumina-fileinfo_zh_TW.ts \ i18n/lumina-fileinfo_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/ INSTALLS += target dotrans diff --git a/lumina-fm/lumina-fm.pro b/lumina-fm/lumina-fm.pro index 613fab69..56077612 100644 --- a/lumina-fm/lumina-fm.pro +++ b/lumina-fm/lumina-fm.pro @@ -1,17 +1,11 @@ +include("$${PWD}/../OS-detect.pri") QT += core gui greaterThan(QT_MAJOR_VERSION, 4): QT += widgets multimedia multimediawidgets network concurrent svg TARGET = lumina-fm -isEmpty(PREFIX) { - PREFIX = /usr/local -} -target.path = $$DESTDIR$$PREFIX/bin - -isEmpty(LIBPREFIX) { - LIBPREFIX = $$PREFIX/lib -} +target.path = $$DESTDIR$${L_BINDIR} TEMPLATE = app @@ -42,17 +36,8 @@ FORMS += MainUI.ui \ # RESOURCES+= lumina-fm.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-fm_af.ts \ @@ -118,11 +103,11 @@ TRANSLATIONS = i18n/lumina-fm_af.ts \ i18n/lumina-fm_zh_TW.ts \ i18n/lumina-fm_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-fm.desktop -desktop.path=$$PREFIX/share/applications/ +desktop.path=$${L_SHAREDIR}/applications/ INSTALLS += target dotrans desktop 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 diff --git a/lumina-open/lumina-open.pro b/lumina-open/lumina-open.pro index f7c409f2..70d4c88f 100644 --- a/lumina-open/lumina-open.pro +++ b/lumina-open/lumina-open.pro @@ -1,17 +1,11 @@ +include("$${PWD}/../OS-detect.pri") QT += core gui greaterThan(QT_MAJOR_VERSION, 4): QT += widgets x11extras TARGET = lumina-open -isEmpty(PREFIX) { - PREFIX = /usr/local -} -target.path = $$DESTDIR$$PREFIX/bin - -isEmpty(LIBPREFIX) { - LIBPREFIX = $$PREFIX/lib -} +target.path = $$DESTDIR$${L_BINDIR} TEMPLATE = app @@ -24,16 +18,9 @@ FORMS += LFileDialog.ui RESOURCES+= lumina-open.qrc -INCLUDEPATH += ../libLumina $$PREFIX/include -LIBS += -L../libLumina -L$$LIBPREFIX -lLuminaUtils -QMAKE_LIBDIR = ../libLumina -DEPENDPATH += ../libLumina +LIBS += -lLuminaUtils -isEmpty(QT5LIBDIR) { - QT5LIBDIR = $$PREFIX/lib/qt5 -} - -LRELEASE = $$QT5LIBDIR/bin/lrelease +DEPENDPATH += ../libLumina TRANSLATIONS = i18n/lumina-open_af.ts \ @@ -99,8 +86,8 @@ TRANSLATIONS = i18n/lumina-open_af.ts \ i18n/lumina-open_zh_TW.ts \ i18n/lumina-open_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/ INSTALLS += target dotrans diff --git a/lumina-screenshot/lumina-screenshot.pro b/lumina-screenshot/lumina-screenshot.pro index a59f5a7d..56c2219b 100644 --- a/lumina-screenshot/lumina-screenshot.pro +++ b/lumina-screenshot/lumina-screenshot.pro @@ -1,17 +1,11 @@ +include("$${PWD}/../OS-detect.pri") QT += core gui greaterThan(QT_MAJOR_VERSION, 4): QT += widgets x11extras TARGET = lumina-screenshot -isEmpty(PREFIX) { - PREFIX = /usr/local -} -target.path = $$DESTDIR$$PREFIX/bin - -isEmpty(LIBPREFIX) { - LIBPREFIX = $$PREFIX/lib -} +target.path = $$DESTDIR$${L_BINDIR} TEMPLATE = app @@ -22,17 +16,8 @@ HEADERS += MainUI.h FORMS += MainUI.ui -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-screenshot_af.ts \ @@ -98,11 +83,11 @@ TRANSLATIONS = i18n/lumina-screenshot_af.ts \ i18n/lumina-screenshot_zh_TW.ts \ i18n/lumina-screenshot_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-screenshot.desktop -desktop.path=$$PREFIX/share/applications/ +desktop.path=$${L_SHAREDIR}/applications/ INSTALLS += target dotrans desktop diff --git a/lumina-search/lumina-search.pro b/lumina-search/lumina-search.pro index 65d195d5..bd894a6d 100644 --- a/lumina-search/lumina-search.pro +++ b/lumina-search/lumina-search.pro @@ -1,17 +1,12 @@ +include("$${PWD}/../OS-detect.pri") QT += core gui greaterThan(QT_MAJOR_VERSION, 4): QT += widgets TARGET = lumina-search -isEmpty(PREFIX) { - PREFIX = /usr/local -} -target.path = $$DESTDIR$$PREFIX/bin +target.path = $$DESTDIR$${L_BINDIR} -isEmpty(LIBPREFIX) { - LIBPREFIX = $$PREFIX/lib -} TEMPLATE = app @@ -27,18 +22,8 @@ HEADERS += MainUI.h \ FORMS += MainUI.ui \ ConfigUI.ui -INCLUDEPATH += ../libLumina $$PREFIX/include +LIBS += -lLuminaUtils -LIBS += -L../libLumina -L$$LIBPREFIX -lLuminaUtils - -isEmpty(QT5LIBDIR) { - QT5LIBDIR = $$PREFIX/lib/qt5 -} - -LRELEASE = $$QT5LIBDIR/bin/lrelease - - -QMAKE_LIBDIR = ../libLumina DEPENDPATH += ../libLumina TRANSLATIONS = i18n/lumina-search_af.ts \ @@ -104,11 +89,11 @@ TRANSLATIONS = i18n/lumina-search_af.ts \ i18n/lumina-search_zh_TW.ts \ i18n/lumina-search_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-search.desktop -desktop.path=$$PREFIX/share/applications/ +desktop.path=$${L_SHAREDIR}/applications/ INSTALLS += target dotrans desktop diff --git a/lumina-wm-INCOMPLETE/lumina-wm.pro b/lumina-wm-INCOMPLETE/lumina-wm.pro index aba210fe..a1a4d2f8 100644 --- a/lumina-wm-INCOMPLETE/lumina-wm.pro +++ b/lumina-wm-INCOMPLETE/lumina-wm.pro @@ -1,30 +1,17 @@ +include("$${PWD}/../OS-detect.pri") QT += core gui network greaterThan(QT_MAJOR_VERSION, 4): QT += widgets x11extras TARGET = lumina-wm -isEmpty(PREFIX) { - PREFIX = /usr/local -} target.path = $$DESTDIR$$PREFIX/bin -isEmpty(LIBPREFIX) { - LIBPREFIX = $$PREFIX/lib -} +LIBS += -lLuminaUtils -lxcb -lxcb-damage -lxcb-composite -lxcb-screensaver -lxcb-util -LIBS += -L../libLumina -L$$LIBPREFIX -lLuminaUtils -lxcb -lxcb-damage -lxcb-composite -lxcb-screensaver -lxcb-util -QMAKE_LIBDIR = ../libLumina DEPENDPATH += ../libLumina TEMPLATE = app -isEmpty(QT5LIBDIR) { - QT5LIBDIR = $$PREFIX/lib/qt5 -} - -LRELEASE = $$QT5LIBDIR/bin/lrelease - - SOURCES += main.cpp \ WMSession.cpp \ LScreenSaver.cpp \ @@ -49,8 +36,6 @@ FORMS += LLockScreen.ui #Now add in all the screensaver animation plugins include(animations/animations.pri) -INCLUDEPATH += ../libLumina $$PREFIX/include - TRANSLATIONS = i18n/lumina-wm_af.ts \ i18n/lumina-wm_ar.ts \ i18n/lumina-wm_az.ts \ @@ -114,8 +99,8 @@ TRANSLATIONS = i18n/lumina-wm_af.ts \ i18n/lumina-wm_zh_TW.ts \ i18n/lumina-wm_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/ INSTALLS += target dotrans diff --git a/lumina-xconfig/lumina-xconfig.pro b/lumina-xconfig/lumina-xconfig.pro index bc050966..4900291b 100644 --- a/lumina-xconfig/lumina-xconfig.pro +++ b/lumina-xconfig/lumina-xconfig.pro @@ -1,16 +1,10 @@ +include("$${PWD}/../OS-detect.pri") QT += core gui greaterThan(QT_MAJOR_VERSION, 4): QT += widgets network TARGET = lumina-xconfig -isEmpty(PREFIX) { - PREFIX = /usr/local -} -target.path = $$DESTDIR$$PREFIX/bin - -isEmpty(LIBPREFIX) { - LIBPREFIX = $$PREFIX/lib -} +target.path = $$DESTDIR$${L_BINDIR} TEMPLATE = app @@ -23,18 +17,9 @@ FORMS += mainUI.ui # RESOURCES+= lumina-config.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-xconfig_af.ts \ @@ -100,8 +85,8 @@ TRANSLATIONS = i18n/lumina-xconfig_af.ts \ i18n/lumina-xconfig_zh_TW.ts \ i18n/lumina-xconfig_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/ INSTALLS += target dotrans |