diff -p -up iproute2-2.6.26/Makefile.libdir iproute2-2.6.26/Makefile --- iproute2-2.6.26/Makefile.libdir 2008-07-25 22:46:07.000000000 +0200 +++ iproute2-2.6.26/Makefile 2008-07-30 18:25:35.000000000 +0200 @@ -1,6 +1,8 @@ DESTDIR=/usr/ SBINDIR=/sbin CONFDIR=/etc/iproute2 +LIBDIR=/usr/lib +VARLIB=/var/lib DOCDIR=/share/doc/iproute2 MANDIR=/share/man @@ -22,7 +24,7 @@ ADDLIB+=ipx_ntop.o ipx_pton.o CC = gcc HOSTCC = gcc CCOPTS = -D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -CFLAGS = $(CCOPTS) -I../include $(DEFINES) +CFLAGS = -DLIBDIR=\"$(LIBDIR)\" -DVARLIB=\"$(VARLIB)\" $(CCOPTS) -I../include $(DEFINES) YACCFLAGS = -d -t -v LDLIBS += -L../lib -lnetlink -lutil diff -p -up iproute2-2.6.26/include/iptables.h.libdir iproute2-2.6.26/include/iptables.h --- iproute2-2.6.26/include/iptables.h.libdir 2008-07-25 22:46:07.000000000 +0200 +++ iproute2-2.6.26/include/iptables.h 2008-07-30 18:25:35.000000000 +0200 @@ -5,7 +5,7 @@ #include "libiptc/libiptc.h" #ifndef IPT_LIB_DIR -#define IPT_LIB_DIR "/usr/local/lib/iptables" +#define IPT_LIB_DIR LIBDIR #endif #ifndef IPPROTO_SCTP diff -p -up iproute2-2.6.26/misc/arpd.c.libdir iproute2-2.6.26/misc/arpd.c --- iproute2-2.6.26/misc/arpd.c.libdir 2008-07-25 22:46:07.000000000 +0200 +++ iproute2-2.6.26/misc/arpd.c 2008-07-30 18:26:19.000000000 +0200 @@ -40,7 +40,7 @@ int resolve_hosts; DB *dbase; -char *dbname = "/var/lib/arpd/arpd.db"; +char *dbname = VARLIB "/arpd/arpd.db"; int ifnum; int *ifvec; diff -p -up iproute2-2.6.26/netem/Makefile.libdir iproute2-2.6.26/netem/Makefile --- iproute2-2.6.26/netem/Makefile.libdir 2008-07-25 22:46:07.000000000 +0200 +++ iproute2-2.6.26/netem/Makefile 2008-07-30 18:25:35.000000000 +0200 @@ -5,6 +5,8 @@ HOSTCC ?= $(CC) CCOPTS = $(CBUILD_CFLAGS) LDLIBS += -lm +LIBDIR = /usr/lib + all: $(DISTGEN) $(DISTDATA) $(DISTGEN): @@ -20,9 +22,9 @@ stats: stats.c $(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm install: all - mkdir -p $(DESTDIR)/lib/tc + mkdir -p $(DESTDIR)$(LIBDIR)/tc for i in $(DISTDATA); \ - do install -m 755 $$i $(DESTDIR)/lib/tc; \ + do install -m 755 $$i $(DESTDIR)$(LIBDIR)/tc; \ done clean: diff -p -up iproute2-2.6.26/tc/Makefile.libdir iproute2-2.6.26/tc/Makefile --- iproute2-2.6.26/tc/Makefile.libdir 2008-07-25 22:46:07.000000000 +0200 +++ iproute2-2.6.26/tc/Makefile 2008-07-30 18:25:35.000000000 +0200 @@ -72,10 +72,10 @@ libtc.a: $(TCLIB) $(AR) rcs $@ $(TCLIB) install: all - mkdir -p $(DESTDIR)/lib/tc + mkdir -p $(DESTDIR)$(LIBDIR)/tc install -m 0755 tc $(DESTDIR)$(SBINDIR) for i in $(TCSO); \ - do install -m 755 $$i $(DESTDIR)/lib/tc; \ + do install -m 755 $$i $(DESTDIR)$(LIBDIR)/tc; \ done clean: diff -p -up iproute2-2.6.26/tc/tc_util.c.libdir iproute2-2.6.26/tc/tc_util.c --- iproute2-2.6.26/tc/tc_util.c.libdir 2008-07-25 22:46:07.000000000 +0200 +++ iproute2-2.6.26/tc/tc_util.c 2008-07-30 18:25:35.000000000 +0200 @@ -34,7 +34,7 @@ const char *get_tc_lib(void) lib_dir = getenv("TC_LIB_DIR"); if (!lib_dir) - lib_dir = DESTDIR "/lib/tc"; + lib_dir = DESTDIR LIBDIR "/tc"; return lib_dir; }