[a28f18d] | 1 | Submitted By: Jim Gifford < jim at cross-lfs dot org> |
---|
| 2 | Date: 2009-02-08 |
---|
| 3 | Upstream Status: Unknown |
---|
| 4 | Origin: Joe Ciccone |
---|
| 5 | Description: This patch gives the ability to change the libdir. |
---|
| 6 | Updated for Iproute2-2.6.28 by Jim Gifford |
---|
| 7 | Discovered tc directory is text files moved to /usr/share |
---|
| 8 | |
---|
| 9 | diff -Naur iproute2-2.6.28.orig/include/iptables.h iproute2-2.6.28/include/iptables.h |
---|
| 10 | --- iproute2-2.6.28.orig/include/iptables.h 2009-01-15 12:25:04.000000000 -0800 |
---|
| 11 | +++ iproute2-2.6.28/include/iptables.h 2009-02-08 16:52:27.636947898 -0800 |
---|
| 12 | @@ -4,8 +4,12 @@ |
---|
| 13 | #include "iptables_common.h" |
---|
| 14 | #include "libiptc/libiptc.h" |
---|
| 15 | |
---|
| 16 | +#ifndef LIBDIR |
---|
| 17 | +#define LIBDIR "/lib" |
---|
| 18 | +#endif |
---|
| 19 | + |
---|
| 20 | #ifndef IPT_LIB_DIR |
---|
| 21 | -#define IPT_LIB_DIR "/usr/local/lib/iptables" |
---|
| 22 | +#define IPT_LIB_DIR LIBDIR "/iptables" |
---|
| 23 | #endif |
---|
| 24 | |
---|
| 25 | #ifndef IPPROTO_SCTP |
---|
| 26 | diff -Naur iproute2-2.6.28.orig/Makefile iproute2-2.6.28/Makefile |
---|
| 27 | --- iproute2-2.6.28.orig/Makefile 2009-01-15 12:25:04.000000000 -0800 |
---|
| 28 | +++ iproute2-2.6.28/Makefile 2009-02-08 16:54:40.912668809 -0800 |
---|
| 29 | @@ -4,6 +4,7 @@ |
---|
| 30 | CONFDIR=/etc/iproute2 |
---|
| 31 | DOCDIR=/share/doc/iproute2 |
---|
| 32 | MANDIR=/share/man |
---|
| 33 | +SHAREDIR=/usr/share |
---|
| 34 | |
---|
| 35 | # Path to db_185.h include |
---|
| 36 | DBM_INCLUDE:=/usr/include |
---|
| 37 | diff -Naur iproute2-2.6.28.orig/netem/Makefile iproute2-2.6.28/netem/Makefile |
---|
| 38 | --- iproute2-2.6.28.orig/netem/Makefile 2009-01-15 12:25:04.000000000 -0800 |
---|
| 39 | +++ iproute2-2.6.28/netem/Makefile 2009-02-08 16:52:27.636947898 -0800 |
---|
| 40 | @@ -20,9 +20,9 @@ |
---|
| 41 | $(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm |
---|
| 42 | |
---|
| 43 | install: all |
---|
| 44 | - mkdir -p $(DESTDIR)/lib/tc |
---|
| 45 | + mkdir -p $(DESTDIR)$(SHAREDIR)/tc |
---|
| 46 | for i in $(DISTDATA); \ |
---|
| 47 | - do install -m 755 $$i $(DESTDIR)/lib/tc; \ |
---|
| 48 | + do install -m 755 $$i $(DESTDIR)$(SHAREDIR)/tc; \ |
---|
| 49 | done |
---|
| 50 | |
---|
| 51 | clean: |
---|
| 52 | diff -Naur iproute2-2.6.28.orig/tc/Makefile iproute2-2.6.28/tc/Makefile |
---|
| 53 | --- iproute2-2.6.28.orig/tc/Makefile 2009-01-15 12:25:04.000000000 -0800 |
---|
| 54 | +++ iproute2-2.6.28/tc/Makefile 2009-02-08 16:54:21.971717000 -0800 |
---|
| 55 | @@ -75,10 +75,10 @@ |
---|
| 56 | $(AR) rcs $@ $(TCLIB) |
---|
| 57 | |
---|
| 58 | install: all |
---|
| 59 | - mkdir -p $(DESTDIR)$(LIBDIR)/tc |
---|
| 60 | + mkdir -p $(DESTDIR)$(SHAREDIR)/tc |
---|
| 61 | install -m 0755 tc $(DESTDIR)$(SBINDIR) |
---|
| 62 | for i in $(TCSO); \ |
---|
| 63 | - do install -m 755 $$i $(DESTDIR)$(LIBDIR)/tc; \ |
---|
| 64 | + do install -m 755 $$i $(DESTDIR)$(SHAREDIR)/tc; \ |
---|
| 65 | done |
---|
| 66 | |
---|
| 67 | clean: |
---|
| 68 | diff -Naur iproute2-2.6.28.orig/tc/tc_util.c iproute2-2.6.28/tc/tc_util.c |
---|
| 69 | --- iproute2-2.6.28.orig/tc/tc_util.c 2009-01-15 12:25:04.000000000 -0800 |
---|
| 70 | +++ iproute2-2.6.28/tc/tc_util.c 2009-02-08 16:56:15.030906272 -0800 |
---|
| 71 | @@ -24,8 +24,8 @@ |
---|
| 72 | #include "utils.h" |
---|
| 73 | #include "tc_util.h" |
---|
| 74 | |
---|
| 75 | -#ifndef LIBDIR |
---|
| 76 | -#define LIBDIR "/usr/lib/" |
---|
| 77 | +#ifndef SHAREDIR |
---|
| 78 | +#define SHAREDIR "/usr/share" |
---|
| 79 | #endif |
---|
| 80 | |
---|
| 81 | const char *get_tc_lib(void) |
---|
| 82 | @@ -34,7 +34,7 @@ |
---|
| 83 | |
---|
| 84 | lib_dir = getenv("TC_LIB_DIR"); |
---|
| 85 | if (!lib_dir) |
---|
| 86 | - lib_dir = LIBDIR "/tc/"; |
---|
| 87 | + lib_dir = SHAREDIR "/tc"; |
---|
| 88 | |
---|
| 89 | return lib_dir; |
---|
| 90 | } |
---|