diff options
author | root <root@rshg054.dnsready.net> | 2012-06-20 00:01:41 +0000 |
---|---|---|
committer | root <root@rshg054.dnsready.net> | 2012-06-20 00:01:41 +0000 |
commit | 530e6e88786befa5d1bcd569e480f1b9fec5b102 (patch) | |
tree | 78088a8187ab892bdaa7001bcd2e76abd66837df /testing/iproute2/iproute2-fhs.patch | |
parent | e4afcc505c31482d7d7cee60bb6388bfacc8ad7f (diff) |
Wed Jun 20 00:01:41 UTC 2012
Diffstat (limited to 'testing/iproute2/iproute2-fhs.patch')
-rw-r--r-- | testing/iproute2/iproute2-fhs.patch | 75 |
1 files changed, 75 insertions, 0 deletions
diff --git a/testing/iproute2/iproute2-fhs.patch b/testing/iproute2/iproute2-fhs.patch new file mode 100644 index 000000000..add3635ca --- /dev/null +++ b/testing/iproute2/iproute2-fhs.patch @@ -0,0 +1,75 @@ +diff -Naur iproute2-3.4.0/Makefile iproute2-3.4.0.new/Makefile +--- iproute2-3.4.0/Makefile 2012-05-21 23:12:19.000000000 +0200 ++++ iproute2-3.4.0.new/Makefile 2012-06-18 10:23:53.896760158 +0200 +@@ -1,7 +1,8 @@ + ROOTDIR=$(DESTDIR) + PREFIX=/usr + LIBDIR=$(PREFIX)/lib +-SBINDIR=/sbin ++SBINDIR=/usr/sbin ++SHAREDIR=/usr/share + CONFDIR=/etc/iproute2 + DATADIR=$(PREFIX)/share + DOCDIR=$(DATADIR)/doc/iproute2 +diff -Naur iproute2-3.4.0/netem/Makefile iproute2-3.4.0.new/netem/Makefile +--- iproute2-3.4.0/netem/Makefile 2012-05-21 23:12:19.000000000 +0200 ++++ iproute2-3.4.0.new/netem/Makefile 2012-06-18 10:23:53.896760158 +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-3.4.0/tc/Makefile iproute2-3.4.0.new/tc/Makefile +--- iproute2-3.4.0/tc/Makefile 2012-05-21 23:12:19.000000000 +0200 ++++ iproute2-3.4.0.new/tc/Makefile 2012-06-18 10:23:53.893426840 +0200 +@@ -105,18 +105,11 @@ + $(AR) rcs $@ $(TCLIB) + + install: all +- mkdir -p $(MODDESTDIR) ++ mkdir -p $(DESTDIR)$(LIBDIR)/tc + install -m 0755 tc $(DESTDIR)$(SBINDIR) + for i in $(TCSO); \ +- do install -m 755 $$i $(MODDESTDIR); \ ++ do install -m 755 $$i $(DESTDIR)$(LIBDIR)/tc; \ + 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 + + clean: + rm -f $(TCOBJ) $(TCLIB) libtc.a tc *.so emp_ematch.yacc.h; \ +diff -Naur iproute2-3.4.0/tc/tc_util.c iproute2-3.4.0.new/tc/tc_util.c +--- iproute2-3.4.0/tc/tc_util.c 2012-05-21 23:12:19.000000000 +0200 ++++ iproute2-3.4.0.new/tc/tc_util.c 2012-06-18 10:23:53.893426840 +0200 +@@ -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; + } |