72 lines
1.8 KiB
Diff
72 lines
1.8 KiB
Diff
--- Makefile 2012-05-21 23:12:19.000000000 +0200
|
|
+++ Makefile 2012-06-18 10:23:53.896760158 +0200
|
|
@@ -1,7 +1,8 @@
|
|
ROOTDIR=$(DESTDIR)
|
|
PREFIX=/usr
|
|
LIBDIR=$(PREFIX)/lib
|
|
-SBINDIR=/sbin
|
|
+SBINDIR=/usr/bin
|
|
+SHAREDIR=/usr/share
|
|
CONFDIR=/etc/iproute2
|
|
DATADIR=$(PREFIX)/share
|
|
DOCDIR=$(DATADIR)/doc/iproute2
|
|
--- netem/Makefile 2012-05-21 23:12:19.000000000 +0200
|
|
+++ netem/Makefile 2012-06-18 10:23:53.896760158 +0200
|
|
@@ -20,9 +20,9 @@
|
|
$(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm
|
|
|
|
install: all
|
|
- mkdir -p $(DESTDIR)$(LIBDIR)/tc
|
|
+ mkdir -p $(DESTDIR)$(SHAREDIR)/tc
|
|
for i in $(DISTDATA); \
|
|
- do install -m 644 $$i $(DESTDIR)$(LIBDIR)/tc; \
|
|
+ do install -m 644 $$i $(DESTDIR)$(SHAREDIR)/tc; \
|
|
done
|
|
|
|
clean:
|
|
--- tc/Makefile 2012-05-21 23:12:19.000000000 +0200
|
|
+++ tc/Makefile 2012-06-18 10:23:53.893426840 +0200
|
|
@@ -105,18 +105,11 @@
|
|
$(AR) rcs $@ $(TCLIB)
|
|
|
|
install: all
|
|
- mkdir -p $(MODDESTDIR)
|
|
+ mkdir -p $(DESTDIR)$(LIBDIR)/tc
|
|
install -m 0755 tc $(DESTDIR)$(SBINDIR)
|
|
for i in $(TCSO); \
|
|
- do install -m 755 $$i $(MODDESTDIR); \
|
|
+ do install -m 755 $$i $(DESTDIR)$(LIBDIR)/tc; \
|
|
done
|
|
- if [ ! -f $(MODDESTDIR)/m_ipt.so ]; then \
|
|
- if [ -f $(MODDESTDIR)/m_xt.so ]; \
|
|
- then ln -s m_xt.so $(MODDESTDIR)/m_ipt.so ; \
|
|
- elif [ -f $(MODDESTDIR)/m_xt_old.so ]; \
|
|
- then ln -s m_xt_old.so $(MODDESTDIR)/m_ipt.so ; \
|
|
- fi; \
|
|
- fi
|
|
|
|
clean:
|
|
rm -f $(TCOBJ) $(TCLIB) libtc.a tc *.so emp_ematch.yacc.h; \
|
|
--- tc/tc_util.c 2012-05-21 23:12:19.000000000 +0200
|
|
+++ tc/tc_util.c 2012-06-18 10:23:53.893426840 +0200
|
|
@@ -24,8 +24,8 @@
|
|
#include "utils.h"
|
|
#include "tc_util.h"
|
|
|
|
-#ifndef LIBDIR
|
|
-#define LIBDIR "/usr/lib"
|
|
+#ifndef SHAREDIR
|
|
+#define SHAREDIR "/usr/share"
|
|
#endif
|
|
|
|
const char *get_tc_lib(void)
|
|
@@ -34,7 +34,7 @@
|
|
|
|
lib_dir = getenv("TC_LIB_DIR");
|
|
if (!lib_dir)
|
|
- lib_dir = LIBDIR "/tc/";
|
|
+ lib_dir = SHAREDIR "/tc/";
|
|
|
|
return lib_dir;
|
|
}
|