iproute2-git/iproute2-fhs.patch

   1 diff -Naur iproute2.old/Makefile iproute2-2.6.29/Makefile
   2 --- iproute2.old/Makefile       2009-11-11 22:05:21.251407668 +0100
   3 +++ iproute2-2.6.29/Makefile    2009-11-11 22:07:09.891833516 +0100
   4 @@ -1,11 +1,12 @@
   5  DESTDIR=/usr/
   6  ROOTDIR=$(DESTDIR)
   7  LIBDIR=/usr/lib/
   8 -SBINDIR=/sbin
   9 +SBINDIR=/usr/sbin
  10  CONFDIR=/etc/iproute2
  11 -DOCDIR=/share/doc/iproute2
  12 -MANDIR=/share/man
  13 +DOCDIR=/usr/share/doc/iproute2
  14 +MANDIR=/usr/share/man
  15  ARPDDIR=/var/lib/arpd
  16 +SHAREDIR=/usr/share
  17
  18  # Path to db_185.h include
  19  DBM_INCLUDE:=$(ROOTDIR)/usr/include
  20 diff -Naur iproute2.old/tc/tc_util.c iproute2-2.6.29/tc/tc_util.c
  21 --- iproute2.old/tc/tc_util.c   2009-11-11 22:05:21.298076943 +0100
  22 +++ iproute2-2.6.29/tc/tc_util.c        2009-11-11 22:09:32.865152646 +0100
  23 @@ -24,8 +24,8 @@
  24  #include "utils.h"
  25  #include "tc_util.h"
  26
  27 -#ifndef LIBDIR
  28 -#define LIBDIR "/usr/lib/"
  29 +#ifndef SHAREDIR
  30 +#define SHAREDIR "/usr/share"
  31  #endif
  32
  33  const char *get_tc_lib(void)
  34 @@ -34,7 +34,7 @@
  35
  36         lib_dir = getenv("TC_LIB_DIR");
  37         if (!lib_dir)
  38 -               lib_dir = LIBDIR "/tc/";
  39 +               lib_dir = SHAREDIR "/tc/";
  40
  41         return lib_dir;
  42  }
  43 diff -Naur iproute2.old/netem/Makefile iproute2-2.6.35/netem/Makefile
  44 --- iproute2.old/netem/Makefile 2010-08-06 11:30:48.640940183 +0200
  45 +++ iproute2-2.6.35/netem/Makefile      2010-08-06 11:32:34.210908892 +0200
  46 @@ -20,9 +20,9 @@
  47         $(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm
  48
  49  install: all
  50 -       mkdir -p $(DESTDIR)$(LIBDIR)/tc
  51 +       mkdir -p $(DESTDIR)$(SHAREDIR)/tc
  52         for i in $(DISTDATA); \
  53 -       do install -m 644 $$i $(DESTDIR)$(LIBDIR)/tc; \
  54 +       do install -m 644 $$i $(DESTDIR)$(SHAREDIR)/tc; \
  55         done
  56
  57  clean:
  58 diff -Naur iproute2.old/tc/Makefile iproute2-2.6.35/tc/Makefile
  59 --- iproute2.old/tc/Makefile    2010-08-06 11:48:35.607472252 +0200
  60 +++ iproute2-2.6.35/tc/Makefile 2010-08-06 11:49:36.977473380 +0200
  61 @@ -99,18 +99,11 @@
  62         $(AR) rcs $@ $(TCLIB)
  63
  64  install: all
  65 -       mkdir -p $(MODDESTDIR)
  66 -       install -m 0755 tc $(DESTDIR)$(SBINDIR)
  67 -       for i in $(TCSO); \
  68 -       do install -m 755 $$i $(MODDESTDIR); \
  69 -       done
  70 -       if [ ! -f $(MODDESTDIR)/m_ipt.so ]; then \
  71 -       if [ -f $(MODDESTDIR)/m_xt.so ]; \
  72 -               then ln -s m_xt.so $(MODDESTDIR)/m_ipt.so ; \
  73 -       elif [ -f $(MODDESTDIR)/m_xt_old.so ]; \
  74 -               then ln -s m_xt_old.so $(MODDESTDIR)/m_ipt.so ; \
  75 -       fi; \
  76 -       fi
  77 +       mkdir -p $(DESTDIR)$(LIBDIR)/tc
  78 +       install -m 0755 tc $(DESTDIR)$(SBINDIR)
  79 +       for i in $(TCSO); \
  80 +       do install -m 755 $$i $(DESTDIR)$(LIBDIR)/tc; \
  81 +       done
  82
  83  clean:
  84         rm -f $(TCOBJ) $(TCLIB) libtc.a tc *.so emp_ematch.yacc.h; \