diff options
Diffstat (limited to 'testing/iproute2/iproute2-fhs.patch')
-rw-r--r-- | testing/iproute2/iproute2-fhs.patch | 75 |
1 files changed, 0 insertions, 75 deletions
diff --git a/testing/iproute2/iproute2-fhs.patch b/testing/iproute2/iproute2-fhs.patch deleted file mode 100644 index add3635ca..000000000 --- a/testing/iproute2/iproute2-fhs.patch +++ /dev/null @@ -1,75 +0,0 @@ -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; - } |