source: patches/iproute2-2.6.19-061214-libdir-1.patch @ cab0b17

iproute2-2.6.16-060323

@@ -1 +1 @@
 DESTDIR=
 SBINDIR=/usr/sbin
+LIBDIR=/usr/lib
 CONFDIR=/etc/iproute2
 DOCDIR=/usr/share/doc/iproute2
 MANDIR=/usr/share/man
@@ -22 +23 @@
 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

iproute2-2.6.16-060323

@@ -4 +4 @@
 HOSTCC ?= $(CC)
 LDLIBS += -lm 
 
+LIBDIR = /usr/lib
+
 all: $(DISTGEN) $(DISTDATA)
 
 $(DISTGEN):
@@ -16 +18 @@
         ./maketable experimental.dat > experimental.dist
 
 install: all
-        mkdir -p $(DESTDIR)/usr/lib/tc
+        mkdir -p $(DESTDIR)/$(LIBDIR)/tc
         for i in $(DISTDATA); \
-        do install -m 755 $$i $(DESTDIR)/usr/lib/tc; \
+        do install -m 755 $$i $(DESTDIR)/$(LIBDIR)/tc; \
         done
 
 clean:

iproute2-2.6.16-060323

@@ -69 +69 @@
         $(AR) rcs $@ $(TCLIB)
 
 install: all
-        mkdir -p $(DESTDIR)/usr/lib/tc
+        mkdir -p $(DESTDIR)/$(LIBDIR)/tc
         install -m 0755 -s tc $(DESTDIR)$(SBINDIR)
         for i in $(TCSO); \
-        do install -m 755 -s $$i $(DESTDIR)/usr/lib/tc; \
+        do install -m 755 -s $$i $(DESTDIR)/$(LIBDIR)/tc; \
         done
 
 clean:

iproute2-2.6.16-060323

@@ -48 +48 @@
 #endif
 
 #ifndef IPT_LIB_DIR
-#define IPT_LIB_DIR "/usr/local/lib/iptables"
+#define IPT_LIB_DIR LIBDIR
 #endif
 
 #ifndef PROC_SYS_MODPROBE

iproute2-2.6.16-060323

@@ -60 +60 @@
         char *line = NULL;
         char name[128];
 
-        snprintf(name, sizeof(name), "/usr/lib/tc/%s.dist", type);
+        snprintf(name, sizeof(name), LIBDIR "/tc/%s.dist", type);
         if ((f = fopen(name, "r")) == NULL) {
                 fprintf(stderr, "No distribution data for %s (%s: %s)\n", 
                         type, name, strerror(errno));

iproute2-2.6.16-060323

@@ -99 +99 @@
                 if (strcmp(q->id, str) == 0)
                         return q;
 
-        snprintf(buf, sizeof(buf), "/usr/lib/tc/q_%s.so", str);
+        snprintf(buf, sizeof(buf), LIBDIR "/tc/q_%s.so", str);
         dlh = dlopen(buf, RTLD_LAZY);
         if (!dlh) {
                 /* look in current binary, only open once */
@@ -145 +145 @@
                 if (strcmp(q->id, str) == 0)
                         return q;
 
-        snprintf(buf, sizeof(buf), "/usr/lib/tc/f_%s.so", str);
+        snprintf(buf, sizeof(buf), LIBDIR "/tc/f_%s.so", str);
         dlh = dlopen(buf, RTLD_LAZY);
         if (dlh == NULL) {
                 dlh = BODY;