diff options
author | Luca Boccassi <bluca@debian.org> | 2023-11-06 00:14:10 +0000 |
---|---|---|
committer | Stephen Hemminger <stephen@networkplumber.org> | 2023-11-09 09:03:18 -0800 |
commit | deb66acabe44d103c8368b62a76ef37aa074748d (patch) | |
tree | 4a91a53b3b2f62af44cee58c6616ef5e72004d9f | |
parent | cb0709b74f08e3df3b6cd558e519ab34924a40e7 (diff) | |
download | iproute2-deb66acabe44d103c8368b62a76ef37aa074748d.tar.gz |
Revert "Makefile: ensure CONF_USR_DIR honours the libdir config"
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>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
-rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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 |