File iproute2-libdir-1.diff of Package iproute2

Overview Repositories Revisions Requests Users Attributes Meta

File iproute2-libdir-1.diff of Package iproute2

---
 Makefile           |    8 ++++----
 include/iptables.h |    2 +-
 netem/Makefile     |    6 ++++--
 3 files changed, 9 insertions(+), 7 deletions(-)

Index: Makefile
===================================================================
--- Makefile.orig
+++ Makefile
@@ -1,10 +1,10 @@
 DESTDIR=/usr/
 ROOTDIR=$(DESTDIR)
 LIBDIR=/usr/lib/
-SBINDIR=/sbin
+SBINDIR=/usr/sbin
 CONFDIR=/etc/iproute2
-DOCDIR=/share/doc/iproute2
-MANDIR=/share/man
+DOCDIR=/usr/share/doc/packages/iproute2
+MANDIR=/usr/share/man
 ARPDDIR=/var/lib/arpd
 
 # Path to db_185.h include
@@ -30,7 +30,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)\" $(CCOPTS) -I../include $(DEFINES)
 YACCFLAGS = -d -t -v
 
 SUBDIRS=lib ip tc misc netem genl
Index: include/iptables.h
===================================================================
--- include/iptables.h.orig
+++ 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: netem/Makefile
===================================================================
--- netem/Makefile.orig
+++ 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:

Places

File iproute2-libdir-1.diff of Package iproute2

Places