remove leftover references to /usr/lib/route2

Since commit 962692356a1c ("Makefile: use /usr/share/iproute2 for config
files") the path was moved to /usr/share in Makefile; but there
were leftover references.

Reported-by: Yedaya Katsman <yedaya.ka@gmail.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>

diff --git a/include/utils.h b/include/utils.h
index e0a9c780cb9eb16223905374916813d1b1e7711f..adf6a581a2a6f6d56a2dadfcff290f3d233c91c7 100644 (file)
--- a/include/utils.h
+++ b/include/utils.h
@@ -39,13 +39,6 @@ extern bool do_all;
 extern int echo_request;
 extern int use_iec;
 
-#ifndef CONF_USR_DIR
-#define CONF_USR_DIR "/usr/lib/iproute2"
-#endif
-#ifndef CONF_ETC_DIR
-#define CONF_ETC_DIR "/etc/iproute2"
-#endif
-
 #define SPRINT_BSIZE 64
 #define SPRINT_BUF(x)  char x[SPRINT_BSIZE]
 

diff --git a/lib/rt_names.c b/lib/rt_names.c
index 7dc194b1530cfdad3bc3b20c3b9e3bb0d4d09cb0..3dba96423924f1d388e0dd45a6623aa7ef9941b7 100644 (file)
--- a/lib/rt_names.c
+++ b/lib/rt_names.c
@@ -208,7 +208,10 @@ rtnl_tabhash_initialize_dir(const char *ddir, const struct tabhash tabhash, cons
        snprintf(dirpath_usr, sizeof(dirpath_usr), "%s/%s", CONF_USR_DIR, ddir);
        snprintf(dirpath_etc, sizeof(dirpath_etc), "%s/%s", CONF_ETC_DIR, ddir);
 
-       /* load /usr/lib/iproute2/foo.d/X conf files, unless /etc/iproute2/foo.d/X exists */
+       /*
+        * load CONF_USR_DIR/iproute2/foo.d/X conf files
+        * unless CONF_ETC_DIR/iproute2/foo.d/X exists
+        */
        rtnl_tabhash_readdir(dirpath_usr, dirpath_etc, tabhash, size);
 
        /* load /etc/iproute2/foo.d/X conf files */