diff options
| author | Ken Moore <moorekou@gmail.com> | 2015-10-19 15:41:25 -0400 |
|---|---|---|
| committer | Ken Moore <moorekou@gmail.com> | 2015-10-19 15:41:25 -0400 |
| commit | 5604e237f29eb2cefbfbdcaaaefbce3b9576ab6c (patch) | |
| tree | 89949cff9b1464a6a9e5a1d1187c6a5b51b91ea3 /lumina-desktop/lumina-desktop.pro | |
| parent | Fix a luminaDesktop.conf loading bug with regards to panel sizing. (diff) | |
| download | lumina-5604e237f29eb2cefbfbdcaaaefbce3b9576ab6c.tar.gz lumina-5604e237f29eb2cefbfbdcaaaefbce3b9576ab6c.tar.bz2 lumina-5604e237f29eb2cefbfbdcaaaefbce3b9576ab6c.zip | |
Update how the PC-BSD overlay files for Lumina are installed. Now there is a special "PCBSD" qmake argument to tell Lumina to install the PC-BSD specific config/wallpaper files instead of the generic files.
Diffstat (limited to 'lumina-desktop/lumina-desktop.pro')
| -rw-r--r-- | lumina-desktop/lumina-desktop.pro | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/lumina-desktop/lumina-desktop.pro b/lumina-desktop/lumina-desktop.pro index b917462a..9f791fbc 100644 --- a/lumina-desktop/lumina-desktop.pro +++ b/lumina-desktop/lumina-desktop.pro @@ -82,25 +82,32 @@ icons.files = Lumina-DE.png \ icons.path = $$PREFIX/share/pixmaps -wallpapers.files = wallpapers/Lumina_Wispy_gold_1920x1080.jpg \ - wallpapers/Lumina_Wispy_green_1920x1080.jpg \ - wallpapers/Lumina_Wispy_purple_1920x1080.jpg \ - wallpapers/Lumina_Wispy_red_1920x1080.jpg -wallpapers.path = $$PREFIX/share/wallpapers/Lumina-DE - fluxconf.files = fluxboxconf/fluxbox-init-rc \ fluxboxconf/fluxbox-keys fluxconf.path = $$PREFIX/share/Lumina-DE/ -defaults.files = defaults/desktop-background.jpg \ - defaults/defaultapps.conf \ - defaults/luminaDesktop.conf \ +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 + + +defaults.files = defaults/luminaDesktop.conf \ audiofiles/Logout.ogg \ audiofiles/Login.ogg defaults.path = $$PREFIX/share/Lumina-DE/ conf.path = $$PREFIX/etc -conf.extra = cp defaults/luminaDesktop.conf $(INSTALL_ROOT)$$PREFIX/etc/luminaDesktop.conf.dist + +#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 +}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 +} TRANSLATIONS = i18n/lumina-desktop_af.ts \ i18n/lumina-desktop_ar.ts \ |