build: move settings installation to make

Makefile.in

@@ -7,7 +7,7 @@ PRODUCT_NAME=@PRODUCT_NAME@
 CODENAME=@CODENAME@
 ARCH=$(shell arch)
 
-.PHONY: graphics browser-qt ahttpd boot-grub boot indexhtml install browser-qt/design/bg.png
+.PHONY: graphics browser-qt ahttpd boot-grub boot indexhtml base-settings regreet-settings gnome-settings hyprland-settings wallpapers install browser-qt/design/bg.png
 
 all: graphics
 
@@ -80,7 +80,41 @@ boot: boot-grub
 indexhtml:
 	install -Dpm644 indexhtml/ximper-wiki.desktop $(datadir)/applications/ximper-wiki.desktop
 
-install: browser-qt ahttpd boot indexhtml
+base-settings:
+	install -Dpm644 configs/mc/mc.ini $(sysconfdir)/mc/mc.ini
+	install -Dpm644 skel/skel/.config/Kvantum/kvantum.kvconfig $(sysconfdir)/skel/.config/Kvantum/kvantum.kvconfig
+	install -Dpm644 configs-gschema/ximper-linux-base.gschema.override $(datadir)/glib-2.0/schemas/ximper-linux-base.gschema.override
+
+regreet-settings:
+	install -Dpm644 configs/greetd-regreet/regreet.toml $(sysconfdir)/greetd/regreet.toml
+	install -Dpm644 configs/greetd-regreet/regreet.css $(sysconfdir)/greetd/regreet.css
+
+gnome-settings:
+	install -Dpm644 configs-gschema/ximper-linux-gnome.gschema.override $(datadir)/glib-2.0/schemas/ximper-linux-gnome.gschema.override
+	install -Dpm644 skel/skel/.config/environment.d/qt.conf $(sysconfdir)/skel/.config/environment.d/qt.conf
+
+hyprland-settings:
+	install -Dpm644 configs-gschema/ximper-linux-hyprland.gschema.override $(datadir)/glib-2.0/schemas/ximper-linux-hyprland.gschema.override
+	install -d $(sysconfdir)/skel/.config
+	cp -a skel/skel/.config/hypr $(sysconfdir)/skel/.config/
+	cp -a skel/skel/.config/kitty $(sysconfdir)/skel/.config/
+	install -d $(sysconfdir)/ximperdistro
+	cp -a configs/hyprland $(sysconfdir)/ximperdistro/
+	for i in swaync wofi wlogout swappy; do \
+		ln -s /etc/ximperdistro/hyprland/$$i $(sysconfdir)/skel/.config/$$i; \
+	done
+	for i in hypridle hyprpaper; do \
+		ln -s /etc/ximperdistro/hyprland/hypr/$$i.conf $(sysconfdir)/skel/.config/hypr/$$i.conf; \
+	done
+
+wallpapers:
+	install -d $(datadir)/wallpapers/ximper
+	install -pm644 ximperwallpapers/* $(datadir)/wallpapers/ximper/
+	./imgtognome.sh $(datadir)/wallpapers/ximper/
+	install -d $(datadir)/gnome-background-properties
+	mv $(datadir)/wallpapers/ximper/ximper.xml $(datadir)/gnome-background-properties/
+
+install: browser-qt ahttpd boot indexhtml base-settings regreet-settings gnome-settings hyprland-settings wallpapers
 	# install product icon
 #	for size in 16 22 24 32 48 64 128; do \
 #	    install -Dm 0644 icons/alt-$(THEME)-$$size.png $(datadir)/icons/hicolor/$${size}x$${size}/apps/alt-$(THEME).png; \
@@ -89,6 +123,7 @@ install: browser-qt ahttpd boot indexhtml
 	install -d $(datadir)/design/{$(THEME),backgrounds}
 	install -d $(datadir)/icons/hicolor/32x32/apps
 	cp -a backgrounds icons faces $(datadir)/design/$(THEME)
+	install -Dpm644 pixmaps/ximperlinux.svg $(datadir)/pixmaps/ximperlinux.svg
 	ln -s ../../../wallpapers $(datadir)/design/$(THEME)/backgrounds/more
 	install -d $(sysconfdir)/alternatives/packages.d
 	echo "/usr/share/design-current	/usr/share/design/$(THEME)	000012000047" >> $(sysconfdir)/alternatives/packages.d/branding-$(BRAND)-$(THEME)-graphics

branding.spec

@@ -180,17 +180,6 @@ Requires: Kvantum gtk3-theme-adw-gtk3 kvantum-theme-kvlibadwaita
 %description base-settings
 Base settings for %distro_name
 
-%package sddm-settings
-BuildArch: noarch
-Summary:   SDDM settings for %distro_name
-License:   Distributable
-Group:     Graphical desktop/Other
-AutoReqProv: no
-%branding_add_conflicts %flavour sddm-settings
-
-%description sddm-settings
-SDDM settings for %distro_name
-
 %package regreet-settings
 BuildArch: noarch
 Summary:   ReGreet settings for %distro_name
@@ -281,57 +270,6 @@ make
 %makeinstall
 find %buildroot -name \*.in -delete
 
-mkdir -p %buildroot/%_datadir/install3
-
-mkdir -p %buildroot/%_datadir/glib-2.0/schemas
-install configs-gschema/ximper-linux-base.gschema.override %buildroot%_datadir/glib-2.0/schemas/ximper-linux-base.gschema.override
-install configs-gschema/ximper-linux-gnome.gschema.override %buildroot%_datadir/glib-2.0/schemas/ximper-linux-gnome.gschema.override
-install configs-gschema/ximper-linux-hyprland.gschema.override %buildroot%_datadir/glib-2.0/schemas/ximper-linux-hyprland.gschema.override
-
-mkdir -p %buildroot%_sysconfdir/skel/.config/Kvantum
-install  skel/skel/.config/Kvantum/kvantum.kvconfig %buildroot%_sysconfdir/skel/.config/Kvantum/kvantum.kvconfig
-
-mkdir -p %buildroot%_sysconfdir/skel/.config/environment.d
-install  skel/skel/.config/environment.d/qt.conf %buildroot%_sysconfdir/skel/.config/environment.d/qt.conf
-
-# sddm
-install -d  %buildroot%_sysconfdir/sddm.conf.d/
-cp configs/sddm/%theme.conf %buildroot%_sysconfdir/sddm.conf.d/%theme.conf
-
-# ReGreet
-install -d  %buildroot%_sysconfdir/greetd/
-cp configs/greetd-regreet/regreet.toml %buildroot%_sysconfdir/greetd/regreet.toml
-cp configs/greetd-regreet/regreet.css %buildroot%_sysconfdir/greetd/regreet.css
-
-# hyprland settings
-for i in hypr kitty waybar ; do
-	mkdir -p %buildroot%_sysconfdir/skel/.config/$i
-	cp -r skel/skel/.config/$i %buildroot%_sysconfdir/skel/.config/
-done
-
-# Midnight Commander
-install -d  %buildroot%_sysconfdir/mc/
-cp configs/mc/mc.ini %buildroot%_sysconfdir/mc/mc.ini
-
-mkdir -p %buildroot%_sysconfdir/ximperdistro/
-cp -r configs/hyprland %buildroot%_sysconfdir/ximperdistro/
-
-for i in swaync wofi wlogout swappy; do
-	ln -s %_sysconfdir/ximperdistro/hyprland/$i %buildroot%_sysconfdir/skel/.config/$i
-done
-
-for i in hypridle hyprpaper ; do
-	ln -s %_sysconfdir/ximperdistro/hyprland/hypr/$i.conf %buildroot%_sysconfdir/skel/.config/hypr/$i.conf
-done
-
-install pixmaps/ximperlinux.svg %buildroot%_pixmapsdir/ximperlinux.svg
-
-# backgrounds
-install -pD -m644 -t %buildroot%_datadir/wallpapers/ximper/ ximperwallpapers/*
-./imgtognome.sh %buildroot%_datadir/wallpapers/ximper/
-mkdir -p %buildroot%_datadir/gnome-background-properties
-mv %buildroot%_datadir/wallpapers/ximper/ximper.xml %buildroot%_datadir/gnome-background-properties/
-
 %post bootloader
 [ "$1" -eq 1 ] || exit 0
 . shell-config
@@ -391,9 +329,6 @@ fi
 %_sysconfdir/skel/.config/Kvantum/kvantum.kvconfig
 %_datadir/glib-2.0/schemas/ximper-linux-base.gschema.override
 
-%files sddm-settings
-%_sysconfdir/sddm.conf.d/%theme.conf
-
 %files regreet-settings
 %_sysconfdir/greetd/regreet.toml
 %_sysconfdir/greetd/regreet.css
@@ -408,7 +343,6 @@ fi
 %_sysconfdir/skel/.config/hypr
 %_sysconfdir/skel/.config/kitty
 %_sysconfdir/skel/.config/swaync
-%_sysconfdir/skel/.config/waybar
 %_sysconfdir/skel/.config/wofi
 %_sysconfdir/skel/.config/wlogout
 %_sysconfdir/skel/.config/swappy