Merge `app-defaults` and `sys-defaults` to `config-overrides`

app-defaults/Makefile

@@ -1,11 +0,0 @@
-GLIBSCHEMAS ?= /usr/share/glib-2.0/schemas
-
-.PHONY: install
-
-install:
-	install -d $(DESTDIR)$(GLIBSCHEMAS)
-	install -t $(DESTDIR)$(GLIBSCHEMAS) -m 0644 \
-		20_org.gnome.desktop.wm.preferences.qubes.gschema.override \
-		20_org.gnome.nautilus.qubes.gschema.override \
-		20_org.gnome.settings-daemon.plugins.updates.qubes.gschema.override \
-		20_org.mate.NotificationDaemon.qubes.gschema.override

boot/redhat/Makefile

@@ -1,7 +1,8 @@
+DATADIR ?= /usr/share
 LIBDIR ?= /usr/lib
 SBINDIR ?= /usr/sbin
 SYSCONFDIR ?= /etc
-QUBESDATADIR = /usr/share/qubes
+QUBESDATADIR = $(DATADIR)/qubes
 
 .PHONY: install
 

sys-defaults/Makefile → config-overrides/Makefile

@@ -1,3 +1,5 @@
+DATADIR ?= /usr/share
+GLIBSCHEMAS ?= $(DATADIR)/glib-2.0/schemas
 SYSCONFDIR ?= /etc
 SUDOERSDIR = $(SYSCONFDIR)/sudoers.d
 
@@ -10,3 +12,9 @@ install:
 	install -D -m 0440 sudoers.d_umask $(DESTDIR)$(SUDOERSDIR)/umask
 	install -D -m 0644 20_tcp_timestamps.conf $(DESTDIR)$(SYSCONFDIR)/sysctl.d/20_tcp_timestamps.conf
 	install -D -m 0644 dconf-db-local-dpi $(DESTDIR)$(SYSCONFDIR)/dconf/db/local.d/dpi
+	install -d $(DESTDIR)$(GLIBSCHEMAS)
+	install -t $(DESTDIR)$(GLIBSCHEMAS) -m 0644 \
+		20_org.gnome.desktop.wm.preferences.qubes.gschema.override \
+		20_org.gnome.nautilus.qubes.gschema.override \
+		20_org.gnome.settings-daemon.plugins.updates.qubes.gschema.override \
+		20_org.mate.NotificationDaemon.qubes.gschema.override

debian/rules

@@ -16,8 +16,8 @@ override_dh_auto_build:
 
 override_dh_auto_install:
 	make install-deb
-	make -C app-defaults install
 	make -C app-menu install
+	make -C config-overrides install
 	make -C filesystem install
 	make -C misc install
 	make -C network install
@@ -25,7 +25,6 @@ override_dh_auto_install:
 	make -C package-managers install-apt
 	make -C passwordless-root install
 	make -C passwordless-root/debian install
-	make -C sys-defaults install
 	make -C qubes-rpc install
 	make -C qubes-rpc/kde install
 	make -C qubes-rpc/nautilus install

misc/Makefile

@@ -1,7 +1,8 @@
 BINDIR ?= /usr/bin
+DATADIR ?= /usr/share
 SYSCONFDIR ?= /etc
 UDEVRULESDIR = $(SYSCONFDIR)/udev/rules.d
-QUBESDATADIR = /usr/share/qubes
+QUBESDATADIR = $(DATADIR)/qubes
 
 .PHONY: all clean install
 

rpm_spec/core-agent.spec.in

@@ -291,14 +291,13 @@ usermod -p '' root
 %install
 
 make install-vm DESTDIR=$RPM_BUILD_ROOT
-make -C app-defaults DESTDIR=$RPM_BUILD_ROOT install
 make -C app-menu DESTDIR=$RPM_BUILD_ROOT install
 make -C boot/redhat DESTDIR=$RPM_BUILD_ROOT install
+make -C config-overrides DESTDIR=$RPM_BUILD_ROOT install
 make -C filesystem DESTDIR=$RPM_BUILD_ROOT install
 make -C misc DESTDIR=$RPM_BUILD_ROOT install
 make -C network DESTDIR=$RPM_BUILD_ROOT install
 make -C passwordless-root DESTDIR=$RPM_BUILD_ROOT install
-make -C sys-defaults DESTDIR=$RPM_BUILD_ROOT install
 make -C qubes-rpc DESTDIR=$RPM_BUILD_ROOT install
 make -C qubes-rpc/kde DESTDIR=$RPM_BUILD_ROOT install
 make -C qubes-rpc/nautilus DESTDIR=$RPM_BUILD_ROOT install