--- Makefile | 4 ++-- netem/Makefile | 6 ++++-- tc/q_netem.c | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) Index: iproute2-4.11.0/Makefile =================================================================== --- iproute2-4.11.0.orig/Makefile +++ iproute2-4.11.0/Makefile @@ -9,7 +9,7 @@ endif PREFIX?=/usr LIBDIR?=$(PREFIX)/lib -SBINDIR?=/sbin +SBINDIR?=/usr/sbin CONFDIR?=/etc/iproute2 DATADIR?=$(PREFIX)/share HDRDIR?=$(PREFIX)/include/iproute2 @@ -24,7 +24,7 @@ DBM_INCLUDE:=$(DESTDIR)/usr/include SHARED_LIBS = y -DEFINES= -DRESOLVE_HOSTNAMES -DLIBDIR=\"$(LIBDIR)\" +DEFINES= -DRESOLVE_HOSTNAMES -DLIBDIR=\"$(LIBDIR)\" -DPKGDATADIR=\"$(DATADIR)/tc\" ifneq ($(SHARED_LIBS),y) DEFINES+= -DNO_SHARED_LIBS endif Index: iproute2-4.11.0/netem/Makefile =================================================================== --- iproute2-4.11.0.orig/netem/Makefile +++ iproute2-4.11.0/netem/Makefile @@ -5,6 +5,8 @@ HOSTCC ?= $(CC) CCOPTS = $(CBUILD_CFLAGS) LDLIBS += -lm +LIBDIR = /usr/lib + all: $(DISTGEN) $(DISTDATA) $(DISTGEN): @@ -20,9 +22,9 @@ stats: stats.c $(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm install: all - mkdir -p $(DESTDIR)$(LIBDIR)/tc + mkdir -p $(DESTDIR)/usr/share/tc for i in $(DISTDATA); \ - do install -m 644 $$i $(DESTDIR)$(LIBDIR)/tc; \ + do install -m 644 $$i $(DESTDIR)/usr/share/tc; \ done clean: Index: iproute2-4.11.0/tc/q_netem.c =================================================================== --- iproute2-4.11.0.orig/tc/q_netem.c +++ iproute2-4.11.0/tc/q_netem.c @@ -113,7 +113,7 @@ static int get_distribution(const char * char *line = NULL; char name[128]; - snprintf(name, sizeof(name), "%s/%s.dist", get_tc_lib(), type); + snprintf(name, sizeof(name), "%s/%s.dist", PKGDATADIR, type); if ((f = fopen(name, "r")) == NULL) { fprintf(stderr, "No distribution data for %s (%s: %s)\n", type, name, strerror(errno));