forked from pool/iproute2
Jan Engelhardt
df497c275c
OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iproute2?expand=0&rev=83
67 lines
1.8 KiB
Diff
67 lines
1.8 KiB
Diff
---
|
|
Makefile | 4 ++--
|
|
include/iptables.h | 2 +-
|
|
netem/Makefile | 6 ++++--
|
|
3 files changed, 7 insertions(+), 5 deletions(-)
|
|
|
|
Index: iproute2-3.15.0/Makefile
|
|
===================================================================
|
|
--- iproute2-3.15.0.orig/Makefile
|
|
+++ iproute2-3.15.0/Makefile
|
|
@@ -1,7 +1,7 @@
|
|
ROOTDIR=$(DESTDIR)
|
|
PREFIX=/usr
|
|
LIBDIR=$(PREFIX)/lib
|
|
-SBINDIR=/sbin
|
|
+SBINDIR=/usr/sbin
|
|
CONFDIR=/etc/iproute2
|
|
DATADIR=$(PREFIX)/share
|
|
DOCDIR=$(DATADIR)/doc/iproute2
|
|
@@ -33,7 +33,7 @@ CCOPTS = -O2
|
|
WFLAGS := -Wall -Wstrict-prototypes -Wmissing-prototypes
|
|
WFLAGS += -Wmissing-declarations -Wold-style-definition -Wformat=2
|
|
|
|
-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.15.0/include/iptables.h
|
|
===================================================================
|
|
--- iproute2-3.15.0.orig/include/iptables.h
|
|
+++ iproute2-3.15.0/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.15.0/netem/Makefile
|
|
===================================================================
|
|
--- iproute2-3.15.0.orig/netem/Makefile
|
|
+++ iproute2-3.15.0/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:
|