mirror of
https://gitdl.cn/https://github.com/chakralinux/core.git
synced 2025-02-10 13:44:37 +08:00
50 lines
1.4 KiB
Diff
50 lines
1.4 KiB
Diff
diff -Naur iproute2-4.4.0/Makefile iproute2-4.4.0.new/Makefile
|
|
--- iproute2-4.4.0/Makefile 2016-01-11 16:33:03.000000000 +0000
|
|
+++ iproute2-4.4.0.new/Makefile 2016-03-14 01:34:13.167172630 +0000
|
|
@@ -1,6 +1,6 @@
|
|
PREFIX?=/usr
|
|
LIBDIR?=$(PREFIX)/lib
|
|
-SBINDIR?=/sbin
|
|
+SBINDIR?=$(PREFIX)/sbin
|
|
CONFDIR?=/etc/iproute2
|
|
DATADIR?=$(PREFIX)/share
|
|
DOCDIR?=$(DATADIR)/doc/iproute2
|
|
diff -Naur iproute2-4.4.0/netem/Makefile iproute2-4.4.0.new/netem/Makefile
|
|
--- iproute2-4.4.0/netem/Makefile 2016-01-11 16:33:03.000000000 +0000
|
|
+++ iproute2-4.4.0.new/netem/Makefile 2016-03-14 01:35:52.179485855 +0000
|
|
@@ -20,9 +20,9 @@
|
|
$(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm
|
|
|
|
install: all
|
|
- mkdir -p $(DESTDIR)$(LIBDIR)/tc
|
|
+ mkdir -p $(DESTDIR)$(DATADIR)/tc
|
|
for i in $(DISTDATA); \
|
|
- do install -m 644 $$i $(DESTDIR)$(LIBDIR)/tc; \
|
|
+ do install -m 644 $$i $(DESTDIR)$(DATADIR)/tc; \
|
|
done
|
|
|
|
clean:
|
|
diff -Naur iproute2-4.4.0/tc/tc_util.c iproute2-4.4.0.new/tc/tc_util.c
|
|
--- iproute2-4.4.0/tc/tc_util.c 2016-01-11 16:33:03.000000000 +0000
|
|
+++ iproute2-4.4.0.new/tc/tc_util.c 2016-03-14 01:40:39.286562131 +0000
|
|
@@ -28,8 +28,8 @@
|
|
#include "tc_util.h"
|
|
#include "tc_common.h"
|
|
|
|
-#ifndef LIBDIR
|
|
-#define LIBDIR "/usr/lib"
|
|
+#ifndef DATADIR
|
|
+#define DATADIR "/usr/share"
|
|
#endif
|
|
|
|
static struct db_names *cls_names = NULL;
|
|
@@ -68,7 +68,7 @@
|
|
|
|
lib_dir = getenv("TC_LIB_DIR");
|
|
if (!lib_dir)
|
|
- lib_dir = LIBDIR "/tc/";
|
|
+ lib_dir = DATADIR "/tc/";
|
|
|
|
return lib_dir;
|
|
}
|