[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20231106001410.183542-1-luca.boccassi@gmail.com>
Date: Mon, 6 Nov 2023 00:14:10 +0000
From: luca.boccassi@...il.com
To: netdev@...r.kernel.org
Cc: stephen@...workplumber.org,
aclaudi@...hat.com
Subject: [PATCH iproute2] Revert "Makefile: ensure CONF_USR_DIR honours the libdir config"
From: Luca Boccassi <bluca@...ian.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@...ian.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
Powered by blists - more mailing lists