diff -Nurp iproute2-3.7.0/include/iptables.h iproute2-3.7.0-libdir/include/iptables.h --- iproute2-3.7.0/include/iptables.h 2012-12-11 19:52:39.000000000 +0200 +++ iproute2-3.7.0-libdir/include/iptables.h 2013-01-06 04:03:00.823057685 +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 "/iptables" #endif #ifndef IPPROTO_SCTP diff -Nurp iproute2-3.7.0/Makefile iproute2-3.7.0-libdir/Makefile --- iproute2-3.7.0/Makefile 2012-12-11 19:52:39.000000000 +0200 +++ iproute2-3.7.0-libdir/Makefile 2013-01-06 04:14:30.492390711 +0200 @@ -1,19 +1,19 @@ ROOTDIR=$(DESTDIR) PREFIX=/usr -LIBDIR=$(PREFIX)/lib -SBINDIR=/sbin -CONFDIR=/etc/iproute2 -DATADIR=$(PREFIX)/share -DOCDIR=$(DATADIR)/doc/iproute2 -MANDIR=$(DATADIR)/man -ARPDDIR=/var/lib/arpd +LIBDIR?=$(PREFIX)/lib +SBINDIR?=/sbin +CONFDIR?=/etc/iproute2 +DATADIR?=$(PREFIX)/share +DOCDIR?=$(DATADIR)/doc/iproute2 +MANDIR?=$(DATADIR)/man +ARPDDI?R=/var/lib/arpd # Path to db_185.h include DBM_INCLUDE:=$(ROOTDIR)/usr/include SHARED_LIBS = y -DEFINES= -DRESOLVE_HOSTNAMES -DLIBDIR=\"$(LIBDIR)\" +DEFINES= -DRESOLVE_HOSTNAMES -DLIBDIR=\"$(LIBDIR)\" -DARPDIR=\"$(VARLIB)\" -DIPT_LIB_DIR=\"$(IPT_LIB_DIR)\" ifneq ($(SHARED_LIBS),y) DEFINES+= -DNO_SHARED_LIBS endif @@ -33,7 +33,7 @@ WFLAGS := -Wall -Wstrict-prototypes -Wmissing-prototypes WFLAGS += -Wmissing-declarations -Wold-style-definition -Wformat=2 -CFLAGS = $(WFLAGS) $(CCOPTS) -I../include $(DEFINES) +CFLAGS += $(WFLAGS) $(CCOPTS) -I../include $(DEFINES) YACCFLAGS = -d -t -v SUBDIRS=lib ip tc bridge misc netem genl man diff -Nurp iproute2-3.7.0/misc/arpd.c iproute2-3.7.0-libdir/misc/arpd.c --- iproute2-3.7.0/misc/arpd.c 2012-12-11 19:52:39.000000000 +0200 +++ iproute2-3.7.0-libdir/misc/arpd.c 2013-01-06 04:03:00.823057685 +0200 @@ -40,7 +40,7 @@ int resolve_hosts; DB *dbase; -char *dbname = "/var/lib/arpd/arpd.db"; +char *dbname = ARPDIR "/arpd/arpd.db"; int ifnum; int *ifvec;