diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-10 11:03:58 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-10 11:03:58 +0100 |
| commit | 94c763109f74b446e4d5d31e55ef337c8c8d86cb (patch) | |
| tree | 22d1cd06809f5a5c11241e998d9ead4010ac3c91 /package/iproute2/patches | |
| parent | a217fc80b29080dae963bb15051df023de36ce39 (diff) | |
| parent | 16d94117a716fc361d3db9a2a17cf4c45eab837d (diff) | |
resolve conflicts
Diffstat (limited to 'package/iproute2/patches')
| -rw-r--r-- | package/iproute2/patches/patch-tc_Makefile | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/package/iproute2/patches/patch-tc_Makefile b/package/iproute2/patches/patch-tc_Makefile new file mode 100644 index 000000000..29a11b40b --- /dev/null +++ b/package/iproute2/patches/patch-tc_Makefile @@ -0,0 +1,18 @@ + yeah, right. Disabling everything with echo-statements is really useful. +--- iproute2-2.6.34.orig/tc/Makefile 2010-05-19 17:32:43.000000000 +0200 ++++ iproute2-2.6.34/tc/Makefile 2011-01-03 18:28:02.980563959 +0100 +@@ -99,10 +99,11 @@ libtc.a: $(TCLIB) + $(AR) rcs $@ $(TCLIB) + + install: all +- echo mkdir -p $(MODDESTDIR) +- echo install -m 0755 tc $(DESTDIR)$(SBINDIR) ++ mkdir -p $(MODDESTDIR) ++ mkdir -p $(DESTDIR)$(SBINDIR) ++ install -m 0755 tc $(DESTDIR)$(SBINDIR) + for i in $(TCSO); \ +- do echo install -m 755 $$i $(MODDESTDIR); \ ++ do install -m 755 $$i $(MODDESTDIR); \ + done + if [ ! -f $(MODDESTDIR)/m_ipt.so ]; then \ + if [ -f $(MODDESTDIR)/m_xt.so ]; \ |