Skip to content

Commit 97e172f

Browse files
committed
Small cleanups to the Makefile
Offer variable for systemd unit install location and fixup definitions of some variables
1 parent 82f4ac2 commit 97e172f

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

Makefile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
PKGNAME = dnfdaemon
22
APPNAME = $(PKGNAME)
3-
DATADIR=/usr/share
4-
SYSCONFDIR=/etc
3+
DATADIR := /usr/share
4+
SYSCONFDIR := /etc
55
PKGDIR = $(DATADIR)/$(PKGNAME)
6+
SYSTEMDSYSTEMUNITDIR := /usr/lib/systemd/system
67
ORG_NAME = org.baseurl.DnfSystem
78
ORG_RO_NAME = org.baseurl.DnfSession
89
SUBDIRS = python
@@ -37,7 +38,7 @@ install:
3738
mkdir -p $(DESTDIR)$(PKGDIR)
3839
mkdir -p $(DESTDIR)/usr/lib/systemd/system
3940
install -m644 dbus/$(ORG_NAME).service $(DESTDIR)$(DATADIR)/dbus-1/system-services/.
40-
install -m644 dbus/dnfdaemon.service $(DESTDIR)/usr/lib/systemd/system/.
41+
install -m644 dbus/dnfdaemon.service $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR)/.
4142
install -m644 dbus/$(ORG_RO_NAME).service $(DESTDIR)$(DATADIR)/dbus-1/services/.
4243
install -m644 dbus/$(ORG_NAME).conf $(DESTDIR)$(SYSCONFDIR)/dbus-1/system.d/.
4344
install -m644 policykit1/$(ORG_NAME).policy $(DESTDIR)$(DATADIR)/polkit-1/actions/.

0 commit comments

Comments
 (0)