diff -Naur iproute2.old/Makefile iproute2-2.6.29/Makefile --- iproute2.old/Makefile 2009-11-11 22:05:21.251407668 +0100 +++ iproute2-2.6.29/Makefile 2009-11-11 22:07:09.891833516 +0100 @@ -1,11 +1,12 @@ DESTDIR=/usr/ ROOTDIR=$(DESTDIR) LIBDIR=/usr/lib/ -SBINDIR=/sbin +SBINDIR=/usr/sbin CONFDIR=/etc/iproute2 -DOCDIR=/share/doc/iproute2 -MANDIR=/share/man +DOCDIR=/usr/share/doc/iproute2 +MANDIR=/usr/share/man ARPDDIR=/var/lib/arpd +SHAREDIR=/usr/share # Path to db_185.h include DBM_INCLUDE:=$(ROOTDIR)/usr/include diff -Naur iproute2.old/tc/tc_util.c iproute2-2.6.29/tc/tc_util.c --- iproute2.old/tc/tc_util.c 2009-11-11 22:05:21.298076943 +0100 +++ iproute2-2.6.29/tc/tc_util.c 2009-11-11 22:09:32.865152646 +0100 @@ -24,8 +24,8 @@ #include "utils.h" #include "tc_util.h" -#ifndef LIBDIR -#define LIBDIR "/usr/lib/" +#ifndef SHAREDIR +#define SHAREDIR "/usr/share" #endif const char *get_tc_lib(void) @@ -34,7 +34,7 @@ lib_dir = getenv("TC_LIB_DIR"); if (!lib_dir) - lib_dir = LIBDIR "/tc/"; + lib_dir = SHAREDIR "/tc/"; return lib_dir; } diff -Naur iproute2.old/netem/Makefile iproute2-2.6.35/netem/Makefile --- iproute2.old/netem/Makefile 2010-08-06 11:30:48.640940183 +0200 +++ iproute2-2.6.35/netem/Makefile 2010-08-06 11:32:34.210908892 +0200 @@ -20,9 +20,9 @@ $(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm install: all - mkdir -p $(DESTDIR)$(LIBDIR)/tc + mkdir -p $(DESTDIR)$(SHAREDIR)/tc for i in $(DISTDATA); \ - do install -m 644 $$i $(DESTDIR)$(LIBDIR)/tc; \ + do install -m 644 $$i $(DESTDIR)$(SHAREDIR)/tc; \ done clean: diff -Naur iproute2.old/tc/Makefile iproute2-2.6.35/tc/Makefile --- iproute2.old/tc/Makefile 2010-08-06 11:48:35.607472252 +0200 +++ iproute2-2.6.35/tc/Makefile 2010-08-06 11:49:36.977473380 +0200 @@ -99,18 +99,11 @@ $(AR) rcs $@ $(TCLIB) install: all - mkdir -p $(MODDESTDIR) - install -m 0755 tc $(DESTDIR)$(SBINDIR) - for i in $(TCSO); \ - do install -m 755 $$i $(MODDESTDIR); \ - done - if [ ! -f $(MODDESTDIR)/m_ipt.so ]; then \ - if [ -f $(MODDESTDIR)/m_xt.so ]; \ - then ln -s m_xt.so $(MODDESTDIR)/m_ipt.so ; \ - elif [ -f $(MODDESTDIR)/m_xt_old.so ]; \ - then ln -s m_xt_old.so $(MODDESTDIR)/m_ipt.so ; \ - fi; \ - fi + mkdir -p $(DESTDIR)$(LIBDIR)/tc + install -m 0755 tc $(DESTDIR)$(SBINDIR) + for i in $(TCSO); \ + do install -m 755 $$i $(DESTDIR)$(LIBDIR)/tc; \ + done clean: rm -f $(TCOBJ) $(TCLIB) libtc.a tc *.so emp_ematch.yacc.h; \