Commit b48b342d authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge tag 'linux-cpupower-6.11-rc1-2' of... 

Merge tag 'linux-cpupower-6.11-rc1-2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/shuah/linux into pm-tools

Merge more cpupower utility changes for 6.11-rc1 from Shuah Khan:

"This cpupower second update for Linux 6.11-rc1 consists of

 -- fix to install cpupower library in standard librray intall
    location - /usr/lib

 -- disable direct build of cpupower bench as it can only be
   built from the cpupower main makefile."

* tag 'linux-cpupower-6.11-rc1-2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/shuah/linux:
  cpupower: fix lib default installation path
  cpupower: Disable direct build of the 'bench' subproject
parents d763debc 3a5bb506

tools/power/cpupower/Makefile

+1 −9
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ LANGUAGES = de fr it cs pt ka 
bindir ?=	/usr/bin

sbindir ?=	/usr/sbin

mandir ?=	/usr/man

libdir ?=	/usr/lib

includedir ?=	/usr/include

localedir ?=	/usr/share/locale

docdir ?=       /usr/share/doc/packages/cpupower
@@ -94,15 +95,6 @@ RANLIB = $(CROSS)ranlib 
HOSTCC = gcc

MKDIR = mkdir



# 64bit library detection

include ../../scripts/Makefile.arch



ifeq ($(IS_64_BIT), 1)

libdir ?=	/usr/lib64

else

libdir ?=	/usr/lib

endif



# Now we set up the build system

#

tools/power/cpupower/bench/Makefile

+5 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

ifeq ($(MAKELEVEL),0)

$(error This Makefile is not intended to be run standalone, but only as a part \

of the  main one in the parent dir)

endif



OUTPUT := ./

ifeq ("$(origin O)", "command line")

ifneq ($(O),)