Commit e044b8a9 authored by Francesco Poli (wintermute)'s avatar Francesco Poli (wintermute) Committed by Shuah Khan
Browse files

cpupower: split unitdir from libdir in Makefile 

Improve the installation procedure for the systemd service unit
'cpupower.service', to be more flexible. Some distros install libraries
to /usr/lib64/, but systemd service units have to be installed to
/usr/lib/systemd/system: as a consequence, the installation procedure
should not assume that systemd service units can be installed to
${libdir}/systemd/system ...
Define a dedicated variable ("unitdir") in the Makefile.

Link: https://lore.kernel.org/linux-pm/260b6d79-ab61-43b7-a0eb-813e257bc028@leemhuis.info/T/#m0601940ab439d5cbd288819d2af190ce59e810e6

Fixes: 9c70b779 ("cpupower: add a systemd service to run cpupower")

Link: https://lore.kernel.org/r/20250521211656.65646-1-invernomuto@paranoici.org


Signed-off-by: default avatarFrancesco Poli (wintermute) <invernomuto@paranoici.org>
Tested-by: default avatarThorsten Leemhuis <linux@leemhuis.info>
Signed-off-by: default avatarShuah Khan <skhan@linuxfoundation.org>
parent 19272b37

tools/power/cpupower/Makefile

+5 −4
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ sbindir ?= /usr/sbin 
mandir ?=	/usr/man

libdir ?=	/usr/lib

libexecdir ?=	/usr/libexec

unitdir ?=	/usr/lib/systemd/system

includedir ?=	/usr/include

localedir ?=	/usr/share/locale

docdir ?=       /usr/share/doc/packages/cpupower
@@ -309,9 +310,9 @@ install-tools: $(OUTPUT)cpupower 
	$(INSTALL_DATA) cpupower-service.conf '$(DESTDIR)${confdir}'

	$(INSTALL) -d $(DESTDIR)${libexecdir}

	$(INSTALL_PROGRAM) cpupower.sh '$(DESTDIR)${libexecdir}/cpupower'

	$(INSTALL) -d $(DESTDIR)${libdir}/systemd/system

	sed 's|___CDIR___|${confdir}|; s|___LDIR___|${libexecdir}|' cpupower.service.in > '$(DESTDIR)${libdir}/systemd/system/cpupower.service'

	$(SETPERM_DATA) '$(DESTDIR)${libdir}/systemd/system/cpupower.service'

	$(INSTALL) -d $(DESTDIR)${unitdir}

	sed 's|___CDIR___|${confdir}|; s|___LDIR___|${libexecdir}|' cpupower.service.in > '$(DESTDIR)${unitdir}/cpupower.service'

	$(SETPERM_DATA) '$(DESTDIR)${unitdir}/cpupower.service'



install-man:

	$(INSTALL_DATA) -D man/cpupower.1 $(DESTDIR)${mandir}/man1/cpupower.1
@@ -348,7 +349,7 @@ uninstall: 
	- rm -f $(DESTDIR)${bindir}/utils/cpupower

	- rm -f $(DESTDIR)${confdir}cpupower-service.conf

	- rm -f $(DESTDIR)${libexecdir}/cpupower

	- rm -f $(DESTDIR)${libdir}/systemd/system/cpupower.service

	- rm -f $(DESTDIR)${unitdir}/cpupower.service

	- rm -f $(DESTDIR)${mandir}/man1/cpupower.1

	- rm -f $(DESTDIR)${mandir}/man1/cpupower-frequency-set.1

	- rm -f $(DESTDIR)${mandir}/man1/cpupower-frequency-info.1