iproute2/iproute2-libdir-1.diff

71 lines
1.9 KiB
Diff

---
Makefile | 6 +++---
include/iptables.h | 2 +-
netem/Makefile | 6 ++++--
3 files changed, 8 insertions(+), 6 deletions(-)
Index: iproute2-3.5.1/Makefile
===================================================================
--- iproute2-3.5.1.orig/Makefile
+++ iproute2-3.5.1/Makefile
@@ -1,10 +1,10 @@
ROOTDIR=$(DESTDIR)
PREFIX=/usr
LIBDIR=$(PREFIX)/lib
-SBINDIR=/sbin
+SBINDIR=/usr/sbin
CONFDIR=/etc/iproute2
DATADIR=$(PREFIX)/share
-DOCDIR=$(DATADIR)/doc/iproute2
+DOCDIR=$(DATADIR)/doc/packages/iproute2
MANDIR=$(DATADIR)/man
ARPDDIR=/var/lib/arpd
@@ -35,7 +35,7 @@ HOSTCC = gcc
DEFINES += -D_GNU_SOURCE
CCOPTS = -O2
WFLAGS = -Wall -Wstrict-prototypes
-CFLAGS = $(WFLAGS) $(CCOPTS) -I../include $(DEFINES)
+CFLAGS = -DLIBDIR=\"${LIBDIR}\" $(WFLAGS) $(CCOPTS) -I../include $(DEFINES)
YACCFLAGS = -d -t -v
SUBDIRS=lib ip tc bridge misc netem genl man
Index: iproute2-3.5.1/include/iptables.h
===================================================================
--- iproute2-3.5.1.orig/include/iptables.h
+++ iproute2-3.5.1/include/iptables.h
@@ -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
Index: iproute2-3.5.1/netem/Makefile
===================================================================
--- iproute2-3.5.1.orig/netem/Makefile
+++ iproute2-3.5.1/netem/Makefile
@@ -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)$(LIBDIR)/tc
+ mkdir -p $(DESTDIR)/usr/share/tc
for i in $(DISTDATA); \
- do install -m 644 $$i $(DESTDIR)$(LIBDIR)/tc; \
+ do install -m 644 $$i $(DESTDIR)/usr/share/tc; \
done
clean: