File iproute2-2.6.29-1-libdir-1.diff of Package iproute2

Overview Repositories Revisions Requests Users Attributes Meta

File iproute2-2.6.29-1-libdir-1.diff of Package iproute2

diff -ur iproute2-2.6.29-1.orig/include/iptables.h iproute2-2.6.29-1/include/iptables.h
--- include/iptables.h	2009-03-24 23:40:54.000000000 +0100
+++ include/iptables.h	2009-08-12 14:07:27.568892610 +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 -ur iproute2-2.6.29-1.orig/Makefile iproute2-2.6.29-1/Makefile
--- Makefile	2009-03-24 23:40:54.000000000 +0100
+++ Makefile	2009-08-12 14:07:27.568892610 +0200
@@ -23,7 +23,7 @@
 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
 
 LDLIBS += -L../lib -lnetlink -lutil
diff -ur iproute2-2.6.29-1.orig/netem/Makefile iproute2-2.6.29-1/netem/Makefile
--- netem/Makefile	2009-03-24 23:40:54.000000000 +0100
+++ netem/Makefile	2009-08-12 14:07:27.570892934 +0200
@@ -5,6 +5,8 @@
 CCOPTS  = $(CBUILD_CFLAGS)
 LDLIBS += -lm 
 
+LIBDIR = /usr/lib
+
 all: $(DISTGEN) $(DISTDATA)
 
 $(DISTGEN):
Nur in iproute2-2.6.29-1/netem: Makefile.orig.
Nur in iproute2-2.6.29-1/netem: Makefile.rej.
Nur in iproute2-2.6.29-1/tc: Makefile.orig.
Nur in iproute2-2.6.29-1/tc: Makefile.rej.
Nur in iproute2-2.6.29-1/tc: tc_util.c.orig.
Nur in iproute2-2.6.29-1/tc: tc_util.c.rej.
--- Makefile	2009-03-24 23:40:54.000000000 +0100
+++ Makefile	2009-08-12 14:22:45.785935139 +0200
@@ -1,9 +1,9 @@
 DESTDIR=/usr/
 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
 
 # Path to db_185.h include
 DBM_INCLUDE:=/usr/include
--- netem/Makefile	2009-03-24 23:40:54.000000000 +0100
+++ netem/Makefile	2009-08-12 14:24:57.748903617 +0200
@@ -20,9 +20,9 @@
 	$(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm
 
 install: all
-	mkdir -p $(DESTDIR)/lib/tc
+	mkdir -p $(DESTDIR)/usr/share/tc
 	for i in $(DISTDATA); \
-	do install -m 755 $$i $(DESTDIR)/lib/tc; \
+	do install -m 755 $$i $(DESTDIR)/usr/share/tc; \
 	done
 
 clean:

Places

File iproute2-2.6.29-1-libdir-1.diff of Package iproute2

Places