From 225bac906ee18b848f55ac6c3ef96eb697999d6c Mon Sep 17 00:00:00 2001 From: Martin Wilck Date: Mon, 13 Nov 2023 15:04:14 +0100 Subject: [PATCH 1/2] multipath-tools: set usr_prefix to /usr in default configuration In the default configuration (both prefix and usr_prefix unset), we'd install man pages and headers under /share/man and /include, respectively, which is very unusual. Have usr_prefix default to /usr in (the default) case where prefix is empty, and set it equal to /prefix otherwise. Signed-off-by: Martin Wilck Reviewed-by: Benjamin Marzinski --- Makefile.inc | 2 +- README.md | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Makefile.inc b/Makefile.inc index a20e2cec4..6b4543035 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -36,7 +36,7 @@ prefix := # Prefix for binaries exec_prefix := $(prefix) # Prefix for non-essential libraries (libdmmp) -usr_prefix := $(prefix) +usr_prefix := $(if $(prefix),$(prefix),/usr) # Prefix for configfuration files (multipath.conf) etc_prefix := $(prefix) # Where to install systemd-related files. systemd is usually installed under /usr diff --git a/README.md b/README.md index db03a33c0..d4f35f57c 100644 --- a/README.md +++ b/README.md @@ -131,8 +131,7 @@ The following variables can be passed to the `make` command line: "Usr-merged" distributions[^systemd] may want to set this to `/usr`. The default is empty (`""`). * `usr_prefix`: where to install those parts of the code that aren't necessary - for booting. Non-usr-merged distributions[^systemd] may want to set this to - `/usr`. The default is `$(prefix)`. + for booting. The default is `/usr` if `$(prefix)` is empty, and `$(prefix)` otherwise. * `systemd_prefix`: Prefix for systemd-related files[^systemd]. The default is `/usr`. * `etc_prefix`: The prefix for configuration files. "usr-merged" distributions with immutable `/usr`[^systemd] may want to set this to From bbb7478ea0cfeb643324a76e2b95a5e77a3c093a Mon Sep 17 00:00:00 2001 From: Martin Wilck Date: Thu, 16 Nov 2023 21:59:18 +0100 Subject: [PATCH 2/2] libmultipath: bump version to 0.9.7 --- libmultipath/version.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libmultipath/version.h b/libmultipath/version.h index 00a521ad2..9c549c1a7 100644 --- a/libmultipath/version.h +++ b/libmultipath/version.h @@ -20,9 +20,9 @@ #ifndef _VERSION_H #define _VERSION_H -#define VERSION_CODE 0x000906 +#define VERSION_CODE 0x000907 /* MMDDYY, in hex */ -#define DATE_CODE 0x070517 +#define DATE_CODE 0x0B1017 #define PROG "multipath-tools"