Makefile: major cleanup of custom configurations and kde4 stuff; especially remove /etc/xdg/kwinrc as being the cause of plasma not starting on live iso etc.

This commit is contained in:
Silvan Calarco 2021-09-11 19:00:56 +02:00
parent c215f55deb
commit 90c0bd063f

View File

@ -1,5 +1,5 @@
# Makefile for desktop-base-kde # Makefile for desktop-base-kde
# Copyright (C) 2004-2017 by Silvan Calarco <silvan.calarco@mambasoft.it> # Copyright (C) 2004-2021 by Silvan Calarco <silvan.calarco@mambasoft.it>
# Copyright (C) 2005-2007 by Davide Madrisan <davide.madrisan@gmail.com> # Copyright (C) 2005-2007 by Davide Madrisan <davide.madrisan@gmail.com>
include VERSION include VERSION
@ -74,7 +74,6 @@ pck_srpms = flashplugin msttcorefonts win32codecs skype
pck_infiles := $(wildcard kde/config/*.in \ pck_infiles := $(wildcard kde/config/*.in \
kde/scripts/*.in \ kde/scripts/*.in \
kde/wallpapers/*.in \ kde/wallpapers/*.in \
kde/apps/plasma-desktop/updates/*.in \
SRPMS/*/*.in) SRPMS/*/*.in)
pck_sysconfigfile := distroutils.sysconfig pck_sysconfigfile := distroutils.sysconfig
@ -132,55 +131,13 @@ install-kde-distro-addons: dist-update
@$(INSTALL_DIR) $(DESTDIR)$(datadir) @$(INSTALL_DIR) $(DESTDIR)$(datadir)
@$(INSTALL_DIR) $(DESTDIR)$(sbindir) @$(INSTALL_DIR) $(DESTDIR)$(sbindir)
@$(INSTALL_DIR) $(DESTDIR)$(kde5datadir) @$(INSTALL_DIR) $(DESTDIR)$(kde5datadir)
@$(INSTALL_DIR) $(DESTDIR)$(kdeautostartdir)
@$(INSTALL_DIR) $(DESTDIR)$(kdebindir)
@$(INSTALL_DIR) $(DESTDIR)$(kdeconfigdir)
@$(INSTALL_DIR) $(DESTDIR)$(kde5configdir) @$(INSTALL_DIR) $(DESTDIR)$(kde5configdir)
@$(INSTALL_DIR) $(DESTDIR)$(kde5wallpapersdir) @$(INSTALL_DIR) $(DESTDIR)$(kde5wallpapersdir)
@$(INSTALL_DIR) $(DESTDIR)$(kdeappsdir)
@$(INSTALL_DIR) $(DESTDIR)$(kdeappsdir)/color-schemes
@$(INSTALL_DIR) $(DESTDIR)$(kde5appsdir)/color-schemes @$(INSTALL_DIR) $(DESTDIR)$(kde5appsdir)/color-schemes
@$(INSTALL_DIR) $(DESTDIR)$(kdeappsdir)/konqueror/profiles
@$(INSTALL_DIR) $(DESTDIR)$(kde5appsdir)/konqueror/profiles @$(INSTALL_DIR) $(DESTDIR)$(kde5appsdir)/konqueror/profiles
@$(INSTALL_DIR) $(DESTDIR)$(kdeappsdir)/konsole
@$(INSTALL_DIR) $(DESTDIR)$(kde5appsdir)/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)$(kde5appsdir)/color-schemes/OpenmambaGreen.colors $(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/autostart/kickoff-autoupdate.desktop $(DESTDIR)$(kdeautostartdir)/kickoff-autoupdate.desktop
$(INSTALL_DATA) kde/autostart/kde5-migrate-user-conf.desktop $(DESTDIR)$(kdeautostartdir)/kde5-migrate-user-conf.desktop
$(INSTALL_DATA) kde/config/kcminputrc $(DESTDIR)$(kde5configdir)/kcminputrc
$(INSTALL_DATA) kde/config/kdeglobals $(DESTDIR)$(kde5configdir)/kdeglobals
$(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/kscreenlockerrc $(DESTDIR)$(kde5configdir)/kscreenlockerrc
$(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)$(kde5wallpapersdir) cp -a kde/wallpapers/{$(WALLPAPERS)} $(DESTDIR)$(kde5wallpapersdir)
cp -a kde/desktoptheme $(DESTDIR)$(kdeappsdir)/
$(INSTALL_SCRIPT) bin/kickoffcfg $(DESTDIR)$(kdebindir)/kickoffcfg
$(INSTALL_SCRIPT) bin/kde5-migrate-user-conf $(DESTDIR)$(bindir)/kde5-migrate-user-conf
install-srpms: install-srpms:
@$(INSTALL_DIR) $(DESTDIR)$(distrosrpmsdir) @$(INSTALL_DIR) $(DESTDIR)$(distrosrpmsdir)