[PATCH iproute2] Makefile: ensure CONF_USR_DIR honours the libdir config

[PATCH iproute2] Makefile: ensure CONF_USR_DIR honours the libdir config

[Andrea Claudi]

Following commit cee0cf84bd32 ("configure: add the --libdir option"),
iproute2 lib directory is configurable using the --libdir option on the
configure script. However, CONF_USR_DIR does not honour the configured
lib path in its default value.

This fixes the issue simply using $(LIBDIR) instead of $(PREFIX)/lib.
Please note that the default value for $(LIBDIR) is exactly
$(PREFIX)/lib, so this does not change the default value for
CONF_USR_DIR.

Fixes: 0a0a8f12fa1b ("Read configuration files from /etc and /usr")
Signed-off-by: Andrea Claudi <aclaudi@redhat.com>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 7d1819ce..54539ce4 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@ endif
 PREFIX?=/usr
 SBINDIR?=/sbin
 CONF_ETC_DIR?=/etc/iproute2
-CONF_USR_DIR?=$(PREFIX)/lib/iproute2
+CONF_USR_DIR?=$(LIBDIR)/iproute2
 NETNS_RUN_DIR?=/var/run/netns
 NETNS_ETC_DIR?=/etc/netns
 DATADIR?=$(PREFIX)/share
-- 
2.41.0

Re: [PATCH iproute2] Makefile: ensure CONF_USR_DIR honours the libdir config

[Petr Machata]

Andrea Claudi <aclaudi@redhat.com> writes:

> Following commit cee0cf84bd32 ("configure: add the --libdir option"),
> iproute2 lib directory is configurable using the --libdir option on the
> configure script. However, CONF_USR_DIR does not honour the configured
> lib path in its default value.
>
> This fixes the issue simply using $(LIBDIR) instead of $(PREFIX)/lib.
> Please note that the default value for $(LIBDIR) is exactly
> $(PREFIX)/lib, so this does not change the default value for
> CONF_USR_DIR.
>
> Fixes: 0a0a8f12fa1b ("Read configuration files from /etc and /usr")
> Signed-off-by: Andrea Claudi <aclaudi@redhat.com>

Reviewed-by: Petr Machata <petrm@nvidia.com>

Re: [PATCH iproute2] Makefile: ensure CONF_USR_DIR honours the libdir config

[patchwork-bot+netdevbpf]

Hello:

This patch was applied to iproute2/iproute2.git (main)
by Stephen Hemminger <stephen@networkplumber.org>:

On Fri, 15 Sep 2023 21:59:06 +0200 you wrote:
> Following commit cee0cf84bd32 ("configure: add the --libdir option"),
> iproute2 lib directory is configurable using the --libdir option on the
> configure script. However, CONF_USR_DIR does not honour the configured
> lib path in its default value.
> 
> This fixes the issue simply using $(LIBDIR) instead of $(PREFIX)/lib.
> Please note that the default value for $(LIBDIR) is exactly
> $(PREFIX)/lib, so this does not change the default value for
> CONF_USR_DIR.
> 
> [...]

Here is the summary with links:
  - [iproute2] Makefile: ensure CONF_USR_DIR honours the libdir config
    https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/commit/?id=946753a4459b

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html