source: patches/iproute2-2.6.26-libdir-1.patch@ d0bedea

iproute2-2.6.26

@@ +1 @@
+# Generated config based on /usr/src/clfs-tarballs/conglomeration/iproute2-2.6.26/include

include/iptables.h

@@ -4 +4 @@
 #include "iptables_common.h"
 #include "libiptc/libiptc.h"
 
+#ifndef LIBDIR
+#define LIBDIR "/lib"
+#endif
+
 #ifndef IPT_LIB_DIR
-#define IPT_LIB_DIR "/usr/local/lib/iptables"
+#define IPT_LIB_DIR LIBDIR "/iptables"
 #endif
 
 #ifndef IPPROTO_SCTP

iproute2-2.6.26

@@ -34 +34 @@
 
 #define IPLINK_IOCTL_COMPAT     1
 #ifndef DESTDIR
-#define DESTDIR "/usr/"
+#define DESTDIR "/usr"
+#endif
+
+#ifndef LIBDIR
+#define LIBDIR "/lib"
 #endif
 
 static void usage(void) __attribute__((noreturn));
@@ -81 +85 @@
                 if (strcmp(l->id, id) == 0)
                         return l;
 
-        snprintf(buf, sizeof(buf), DESTDIR "/lib/ip/link_%s.so", id);
+        snprintf(buf, sizeof(buf), DESTDIR LIBDIR "/ip/link_%s.so", id);
         dlh = dlopen(buf, RTLD_LAZY);
         if (dlh == NULL) {
                 /* look in current binary, only open once */

iproute2-2.6.26

@@ -1 @@
-DESTDIR=/usr/
+DESTDIR=/usr
 SBINDIR=/sbin
 CONFDIR=/etc/iproute2
 DOCDIR=/share/doc/iproute2
 MANDIR=/share/man
 
+LIBDIR=/lib
+
 # Path to db_185.h include
 DBM_INCLUDE:=/usr/include
 
-DEFINES= -DRESOLVE_HOSTNAMES -DDESTDIR=\"$(DESTDIR)\"
+DEFINES= -DRESOLVE_HOSTNAMES -DDESTDIR=\"$(DESTDIR)\" -DLIBDIR=\"$(LIBDIR)\"
 
 #options if you have a bind>=4.9.4 libresolv (or, maybe, glibc)
 LDLIBS=-lresolv

netem/Makefile

@@ -20 +20 @@
         $(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm
 
 install: all
-        mkdir -p $(DESTDIR)/lib/tc
+        mkdir -p $(DESTDIR)$(LIBDIR)/tc
         for i in $(DISTDATA); \
-        do install -m 755 $$i $(DESTDIR)/lib/tc; \
+        do install -m 755 $$i $(DESTDIR)$(LIBDIR)/tc; \
         done
 
 clean:

iproute2-2.6.26

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

iproute2-2.6.26

@@ -25 +25 @@
 #include "tc_util.h"
 
 #ifndef DESTDIR
-#define DESTDIR "/usr/"
+#define DESTDIR "/usr"
+#endif
+
+#ifndef LIBDIR
+#define LIBDIR "/lib"
 #endif
 
 const char *get_tc_lib(void)
@@ -34 +38 @@
 
         lib_dir = getenv("TC_LIB_DIR");
         if (!lib_dir)
-                lib_dir = DESTDIR "/lib/tc";
+                lib_dir = DESTDIR LIBDIR "/tc";
 
         return lib_dir;
 }