From 9f6d984ed8631c31cc02f193ce08336e6c741d28 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sat, 2 Jul 2016 17:16:05 +0200 Subject: [PATCH] Makefile: install or link configurations and data in kde5 directories --- Makefile | 75 ++++++++++++++++++++++++++++++-------------------------- 1 file changed, 40 insertions(+), 35 deletions(-) diff --git a/Makefile b/Makefile index b8ae5ec..75aa638 100644 --- a/Makefile +++ b/Makefile @@ -40,14 +40,15 @@ mambawelcomedatadir = ${datadir}/openmamba/mambawelcome bootrecoverdatadir = ${datadir}/openmamba/bootrecover iconsdir = ${datadir}/icons/hicolor kdeprefixdir = $(shell kde4-config --prefix) -kdedatadir = $(kdeprefixdir)/share -kdebindir = $(kdeprefixdir)/bin +kdedatadir = ${kdeprefixdir}/share +kde5datadir = ${prefix}/share +kdebindir = ${kdeprefixdir}/bin kdeautostartdir = ${kdedatadir}/autostart kdeconfigdir = ${kdedatadir}/config kde5configdir = ${sysconfdir}/xdg kdewallpapersdir = ${kdedatadir}/wallpapers kdeappsdir = ${kdedatadir}/apps -kdeplasmadesktopupdatesdir = ${kdeappsdir}/plasma-desktop/updates +kde5appsdir = ${prefix}/share localesdir = ${kdedatadir}/locale xdg_appsdir = ${datadir}/applications @@ -130,46 +131,51 @@ install-kde-distro-addons: dist-update @$(INSTALL_DIR) $(DESTDIR)$(bindir) @$(INSTALL_DIR) $(DESTDIR)$(datadir) @$(INSTALL_DIR) $(DESTDIR)$(sbindir) - @$(INSTALL_DIR) $(DESTDIR)$(distrobindir) - @$(INSTALL_DIR) $(DESTDIR)$(distrokdedir) - @$(INSTALL_DIR) $(DESTDIR)$(kdedatadir) + @$(INSTALL_DIR) $(DESTDIR)$(kde5datadir) @$(INSTALL_DIR) $(DESTDIR)$(kdeautostartdir) @$(INSTALL_DIR) $(DESTDIR)$(kdebindir) @$(INSTALL_DIR) $(DESTDIR)$(kdeconfigdir) @$(INSTALL_DIR) $(DESTDIR)$(kde5configdir) @$(INSTALL_DIR) $(DESTDIR)$(kdewallpapersdir) - @$(INSTALL_DIR) $(DESTDIR)$(kdeplasmadesktopupdatesdir) - @$(INSTALL_DIR) $(DESTDIR)$(kdedatadir)/apps/color-schemes - @$(INSTALL_DIR) $(DESTDIR)$(kdedatadir)/apps/konqueror/profiles - @$(INSTALL_DIR) $(DESTDIR)$(kdedatadir)/apps/konsole - @$(INSTALL_DIR) $(DESTDIR)$(kdedatadir)/apps/plasma-desktop/init - @$(INSTALL_DIR) $(DESTDIR)$(kdedatadir)/apps/plasma-desktop/updates + @$(INSTALL_DIR) $(DESTDIR)$(kdeappsdir) + @$(INSTALL_DIR) $(DESTDIR)$(kdeappsdir)/color-schemes + @$(INSTALL_DIR) $(DESTDIR)$(kde5appsdir)/color-schemes + @$(INSTALL_DIR) $(DESTDIR)$(kdeappsdir)/konqueror/profiles + @$(INSTALL_DIR) $(DESTDIR)$(kde5appsdir)/konqueror/profiles + @$(INSTALL_DIR) $(DESTDIR)$(kdeappsdir)/konsole + @$(INSTALL_DIR) $(DESTDIR)$(kde5appsdir)/konsole + @$(INSTALL_DIR) $(DESTDIR)$(kdeappsdir)/plasma-desktop/init + @$(INSTALL_DIR) $(DESTDIR)$(kdeappsdir)/plasma-desktop/updates $(INSTALL_DATA) etc/pam.d/kde $(DESTDIR)$(sysconfdir)/pam.d/ $(INSTALL_DATA) etc/pam.d/kde-np $(DESTDIR)$(sysconfdir)/pam.d/ $(INSTALL_DATA) etc/sudoers.d/kde4 $(DESTDIR)$(sysconfdir)/sudoers.d/kde4 - $(INSTALL_DATA) kde/apps/color-schemes/OpenmambaGreen.colors $(DESTDIR)$(kdedatadir)/apps/color-schemes/OpenmambaGreen.colors - $(INSTALL_DATA) kde/apps/konqueror/profiles/resourcesbrowsing $(DESTDIR)$(kdedatadir)/apps/konqueror/profiles/resourcesbrowsing - $(INSTALL_DATA) kde/apps/konsole/openmamba.profile $(DESTDIR)$(kdedatadir)/apps/konsole/openmamba.profile - $(INSTALL_DATA) kde/apps/plasma-desktop/init/10-openmamba-default-setup.js $(DESTDIR)$(kdedatadir)/apps/plasma-desktop/init/10-openmamba-default-setup.js - $(INSTALL_DATA) kde/apps/plasma-desktop/updates/10-openmamba-theme.js $(DESTDIR)$(kdedatadir)/apps/plasma-desktop/updates/10-openmamba-theme.js + $(INSTALL_DATA) kde/apps/color-schemes/OpenmambaGreen.colors $(DESTDIR)$(kde5appsdir)/color-schemes/OpenmambaGreen.colors + $(INSTALL_DATA) kde/apps/color-schemes/OpenmambaGreen.colors $(DESTDIR)$(kdeappsdir)/color-schemes/OpenmambaGreen.colors + $(INSTALL_DATA) kde/apps/konqueror/profiles/resourcesbrowsing $(DESTDIR)$(kde5appsdir)/konqueror/profiles/resourcesbrowsing + $(INSTALL_DATA) kde/apps/konqueror/profiles/resourcesbrowsing $(DESTDIR)$(kdeappsdir)/konqueror/profiles/resourcesbrowsing + $(INSTALL_DATA) kde/apps/konsole/openmamba.profile $(DESTDIR)$(kde5appsdir)/konsole/openmamba.profile + $(INSTALL_DATA) kde/apps/konsole/openmamba.profile $(DESTDIR)$(kdeappsdir)/konsole/openmamba.profile + $(INSTALL_DATA) kde/apps/plasma-desktop/init/10-openmamba-default-setup.js $(DESTDIR)$(kdeappsdir)/plasma-desktop/init/10-openmamba-default-setup.js + $(INSTALL_DATA) kde/apps/plasma-desktop/updates/10-openmamba-theme.js $(DESTDIR)$(kdeappsdir)/plasma-desktop/updates/10-openmamba-theme.js $(INSTALL_DATA) kde/autostart/mambatray.desktop $(DESTDIR)$(kdeautostartdir)/mambatray.desktop - $(INSTALL_DATA) kde/config/kcmfonts $(DESTDIR)$(kdeconfigdir)/kcmfonts - $(INSTALL_DATA) kde/config/kcminputrc $(DESTDIR)$(kdeconfigdir)/kcminputrc + $(INSTALL_DATA) kde/config/kcmfonts $(DESTDIR)$(kde5configdir)/kcmfonts + $(INSTALL_DATA) kde/config/kcmfonts $(DESTDIR)$(kde5configdir)/kcmfonts + $(INSTALL_DATA) kde/config/kcminputrc $(DESTDIR)$(kde5configdir)/kcminputrc $(INSTALL_DATA) kde/config/kdeglobals $(DESTDIR)$(kde5configdir)/kdeglobals - $(INSTALL_DATA) kde/config/kdesktoprc $(DESTDIR)$(kdeconfigdir)/kdesktoprc - $(INSTALL_DATA) kde/config/kdesurc $(DESTDIR)$(kdeconfigdir)/kdesurc - $(INSTALL_DATA) kde/config/kglobalshortcutsrc $(DESTDIR)$(kdeconfigdir)/kglobalshortcutsrc - $(INSTALL_DATA) kde/config/kickoffrc $(DESTDIR)$(kdeconfigdir)/kickoffrc - $(INSTALL_DATA) kde/config/kmilodrc $(DESTDIR)$(kdeconfigdir)/kmilodrc - $(INSTALL_DATA) kde/config/kmixrc $(DESTDIR)$(kdeconfigdir)/kmixrc - $(INSTALL_DATA) kde/config/konsolerc $(DESTDIR)$(kdeconfigdir)/konsolerc - $(INSTALL_DATA) kde/config/kwalletrc $(DESTDIR)$(kdeconfigdir)/kwalletrc - $(INSTALL_DATA) kde/config/kwinrc $(DESTDIR)$(kdeconfigdir)/kwinrc - $(INSTALL_DATA) kde/config/nepomukserverrc $(DESTDIR)$(kdeconfigdir)/nepomukserverrc - $(INSTALL_DATA) kde/config/oxygenrc $(DESTDIR)$(kdeconfigdir)/oxygenrc - $(INSTALL_DATA) kde/config/plasma-desktop-appletsrc $(DESTDIR)$(kdeconfigdir)/plasma-desktop-appletsrc - $(INSTALL_DATA) kde/config/plasma-desktoprc $(DESTDIR)$(kdeconfigdir)/plasma-desktoprc - $(INSTALL_DATA) kde/config/powerdevilrc $(DESTDIR)$(kdeconfigdir)/powerdevilrc + $(INSTALL_DATA) kde/config/kdesktoprc $(DESTDIR)$(kde5configdir)/kdesktoprc + $(INSTALL_DATA) kde/config/kdesurc $(DESTDIR)$(kde5configdir)/kdesurc + $(INSTALL_DATA) kde/config/kglobalshortcutsrc $(DESTDIR)$(kde5configdir)/kglobalshortcutsrc + $(INSTALL_DATA) kde/config/kickoffrc $(DESTDIR)$(kde5configdir)/kickoffrc + $(INSTALL_DATA) kde/config/kmilodrc $(DESTDIR)$(kde5configdir)/kmilodrc + $(INSTALL_DATA) kde/config/kmixrc $(DESTDIR)$(kde5configdir)/kmixrc + $(INSTALL_DATA) kde/config/konsolerc $(DESTDIR)$(kde5configdir)/konsolerc + $(INSTALL_DATA) kde/config/kwalletrc $(DESTDIR)$(kde5configdir)/kwalletrc + $(INSTALL_DATA) kde/config/kwinrc $(DESTDIR)$(kde5configdir)/kwinrc + $(INSTALL_DATA) kde/config/nepomukserverrc $(DESTDIR)$(kde5configdir)/nepomukserverrc + $(INSTALL_DATA) kde/config/oxygenrc $(DESTDIR)$(kde5configdir)/oxygenrc + $(INSTALL_DATA) kde/config/plasma-desktop-appletsrc $(DESTDIR)$(kde5configdir)/plasma-desktop-appletsrc + $(INSTALL_DATA) kde/config/plasma-desktoprc $(DESTDIR)$(kde5configdir)/plasma-desktoprc + $(INSTALL_DATA) kde/config/powerdevilrc $(DESTDIR)$(kde5configdir)/powerdevilrc cp -a kde/wallpapers/{$(WALLPAPERS)} $(DESTDIR)$(kdewallpapersdir) cp -a kde/desktoptheme $(DESTDIR)$(kdeappsdir)/ $(INSTALL_SCRIPT) bin/kickoffcfg $(DESTDIR)$(kdebindir)/kickoffcfg @@ -194,8 +200,7 @@ install-icons: done install: $(pck_infiles:.in=) \ - install-kde-distro-addons \ - install-icons + install-kde-distro-addons dist: clean @git log > ChangeLog.git