diff options
| author | Ken Moore <ken@ixsystems.com> | 2017-11-23 12:07:51 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-23 12:07:51 -0500 |
| commit | 1b12360a10a6f379932104258446c54dd26fc60d (patch) | |
| tree | ce2aba7baa3e4fa967930657038ffa2f4d4e1c0f | |
| parent | Revert "Update README.md" (diff) | |
| parent | lumina-desktop.pro: fix out of tree installation (diff) | |
| download | lumina-1b12360a10a6f379932104258446c54dd26fc60d.tar.gz lumina-1b12360a10a6f379932104258446c54dd26fc60d.tar.bz2 lumina-1b12360a10a6f379932104258446c54dd26fc60d.zip | |
Merge pull request #512 from schnitzeltony/master
lumina-desktop.pro: fix out of tree installation
| -rw-r--r-- | src-qt5/core/lumina-desktop/lumina-desktop.pro | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src-qt5/core/lumina-desktop/lumina-desktop.pro b/src-qt5/core/lumina-desktop/lumina-desktop.pro index 82da892c..9c8272c8 100644 --- a/src-qt5/core/lumina-desktop/lumina-desktop.pro +++ b/src-qt5/core/lumina-desktop/lumina-desktop.pro @@ -92,17 +92,17 @@ conf.path = $${L_ETCDIR} message("Installing defaults settings for OS: $${DEFAULT_SETTINGS}") OS=$${DEFAULT_SETTINGS} } -exists("defaults/luminaDesktop-$${OS}.conf"){ +exists("$$PWD/defaults/luminaDesktop-$${OS}.conf"){ message(" -- Found OS-specific system config file: $${OS}"); - conf.extra = cp defaults/luminaDesktop-$${OS}.conf $(INSTALL_ROOT)$${L_ETCDIR}/luminaDesktop.conf.dist + conf.extra = cp $$PWD/defaults/luminaDesktop-$${OS}.conf $(INSTALL_ROOT)$${L_ETCDIR}/luminaDesktop.conf.dist }else{ - conf.extra = cp defaults/luminaDesktop.conf $(INSTALL_ROOT)$${L_ETCDIR}/luminaDesktop.conf.dist + conf.extra = cp $$PWD/defaults/luminaDesktop.conf $(INSTALL_ROOT)$${L_ETCDIR}/luminaDesktop.conf.dist } -exists("defaults/desktop-background-$${OS}.jpg"){ +exists("$$PWD/defaults/desktop-background-$${OS}.jpg"){ message(" -- Found OS-specific background image: $${OS}"); - defaults.extra = cp defaults/desktop-background-$${OS}.jpg $(INSTALL_ROOT)$${L_SHAREDIR}/lumina-desktop/desktop-background.jpg + defaults.extra = cp $$PWD/defaults/desktop-background-$${OS}.jpg $(INSTALL_ROOT)$${L_SHAREDIR}/lumina-desktop/desktop-background.jpg }else{ - defaults.extra = cp defaults/desktop-background.jpg $(INSTALL_ROOT)$${L_SHAREDIR}/lumina-desktop/desktop-background.jpg + defaults.extra = cp $$PWD/defaults/desktop-background.jpg $(INSTALL_ROOT)$${L_SHAREDIR}/lumina-desktop/desktop-background.jpg } TRANSLATIONS = i18n/lumina-desktop_af.ts \ |