source: patches/iproute2-2.6.28-libdir-2.patch@ 970c8d2

clfs-1.2 clfs-2.1 clfs-3.0.0-systemd clfs-3.0.0-sysvinit systemd sysvinit
Last change on this file since 970c8d2 was a28f18d, checked in by Jim Gifford <clfs@…>, 16 years ago

Updated IPRoute2 libdir patch
  • Property mode set to 100644
File size: 2.7 KB

  • include/iptables.h 

    Submitted By: Jim Gifford < jim at cross-lfs dot org>
Date: 2009-02-08
Upstream Status: Unknown
Origin: Joe Ciccone 
Description: This patch gives the ability to change the libdir.
             Updated for Iproute2-2.6.28 by Jim Gifford
             Discovered tc directory is text files moved to /usr/share

diff -Naur iproute2-2.6.28.orig/include/iptables.h iproute2-2.6.28/include/iptables.h
    old new  
    44#include "iptables_common.h"
    55#include "libiptc/libiptc.h"
    66
     7#ifndef LIBDIR
     8#define LIBDIR "/lib"
     9#endif
     10
    711#ifndef IPT_LIB_DIR
    8 #define IPT_LIB_DIR "/usr/local/lib/iptables"
     12#define IPT_LIB_DIR LIBDIR "/iptables"
    913#endif
    1014
    1115#ifndef IPPROTO_SCTP

  • iproute2-2.6.28 

    diff -Naur iproute2-2.6.28.orig/Makefile iproute2-2.6.28/Makefile
    old new  
    44CONFDIR=/etc/iproute2
    55DOCDIR=/share/doc/iproute2
    66MANDIR=/share/man
     7SHAREDIR=/usr/share
    78
    89# Path to db_185.h include
    910DBM_INCLUDE:=/usr/include

  • netem/Makefile 

    diff -Naur iproute2-2.6.28.orig/netem/Makefile iproute2-2.6.28/netem/Makefile
    old new  
    2020        $(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm
    2121
    2222install: all
    23         mkdir -p $(DESTDIR)/lib/tc
     23        mkdir -p $(DESTDIR)$(SHAREDIR)/tc
    2424        for i in $(DISTDATA); \
    25         do install -m 755 $$i $(DESTDIR)/lib/tc; \
     25        do install -m 755 $$i $(DESTDIR)$(SHAREDIR)/tc; \
    2626        done
    2727
    2828clean:

  • iproute2-2.6.28 

    diff -Naur iproute2-2.6.28.orig/tc/Makefile iproute2-2.6.28/tc/Makefile
    old new  
    7575        $(AR) rcs $@ $(TCLIB)
    7676
    7777install: all
    78         mkdir -p $(DESTDIR)$(LIBDIR)/tc
     78        mkdir -p $(DESTDIR)$(SHAREDIR)/tc
    7979        install -m 0755 tc $(DESTDIR)$(SBINDIR)
    8080        for i in $(TCSO); \
    81         do install -m 755 $$i $(DESTDIR)$(LIBDIR)/tc; \
     81        do install -m 755 $$i $(DESTDIR)$(SHAREDIR)/tc; \
    8282        done
    8383
    8484clean:

  • iproute2-2.6.28 

    diff -Naur iproute2-2.6.28.orig/tc/tc_util.c iproute2-2.6.28/tc/tc_util.c
    old new  
    2424#include "utils.h"
    2525#include "tc_util.h"
    2626
    27 #ifndef LIBDIR
    28 #define LIBDIR "/usr/lib/"
     27#ifndef SHAREDIR
     28#define SHAREDIR "/usr/share"
    2929#endif
    3030
    3131const char *get_tc_lib(void)
    … …  
    3434
    3535        lib_dir = getenv("TC_LIB_DIR");
    3636        if (!lib_dir)
    37                 lib_dir = LIBDIR "/tc/";
     37                lib_dir = SHAREDIR "/tc";
    3838
    3939        return lib_dir;
    4040}
Note: See TracBrowser for help on using the repository browser.