From: luca.boccassi@gmail.com
To: netdev@vger.kernel.org
Cc: stephen@networkplumber.org, aclaudi@redhat.com
Subject: [PATCH iproute2] Revert "Makefile: ensure CONF_USR_DIR honours the libdir config"
Date: Mon, 6 Nov 2023 00:14:10 +0000 [thread overview]
Message-ID: <20231106001410.183542-1-luca.boccassi@gmail.com> (raw)
From: Luca Boccassi <bluca@debian.org>
LIBDIR in Debian and derivatives is not /usr/lib/, it's
/usr/lib/<architecture triplet>/, which is different, and it's the
wrong location where to install architecture-independent default
configuration files, which should always go to /usr/lib/ instead.
Installing these files to the per-architecture directory is not
the right thing, hence revert the change.
This reverts commit 946753a4459bd035132a27bb2eb87529c1979b90.
Signed-off-by: Luca Boccassi <bluca@debian.org>
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 54539ce4..7d1819ce 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@ endif
PREFIX?=/usr
SBINDIR?=/sbin
CONF_ETC_DIR?=/etc/iproute2
-CONF_USR_DIR?=$(LIBDIR)/iproute2
+CONF_USR_DIR?=$(PREFIX)/lib/iproute2
NETNS_RUN_DIR?=/var/run/netns
NETNS_ETC_DIR?=/etc/netns
DATADIR?=$(PREFIX)/share
--
2.39.2
next reply other threads:[~2023-11-06 0:14 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-06 0:14 luca.boccassi [this message]
2023-11-10 13:34 ` [PATCH iproute2] Revert "Makefile: ensure CONF_USR_DIR honours the libdir config" Petr Machata
2023-11-10 13:54 ` Petr Machata
2023-11-10 20:31 ` Andrea Claudi
2023-11-10 22:01 ` Luca Boccassi
2023-11-10 13:54 ` Luca Boccassi
2023-11-13 16:40 ` patchwork-bot+netdevbpf
2023-11-13 18:12 ` Andrea Claudi
2023-11-13 23:38 ` Stephen Hemminger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231106001410.183542-1-luca.boccassi@gmail.com \
--to=luca.boccassi@gmail.com \
--cc=aclaudi@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=stephen@networkplumber.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.