summaryrefslogtreecommitdiff
path: root/package/traceroute/patches/patch-Make_rules
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-01-06 09:53:25 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2014-01-06 09:53:25 +0100
commit2288ec26df8e47d9b699e46eecd05eb3570f03a0 (patch)
tree1d204b70e027fd737f6aae1b7308ae959f5bd0b9 /package/traceroute/patches/patch-Make_rules
parent45e7808c41c2e66266f738aa5eff70ce18cc04ac (diff)
parent667bc9e981847a1d117a2fc7110948075a268bdd (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/traceroute/patches/patch-Make_rules')
-rw-r--r--package/traceroute/patches/patch-Make_rules14
1 files changed, 7 insertions, 7 deletions
diff --git a/package/traceroute/patches/patch-Make_rules b/package/traceroute/patches/patch-Make_rules
index 35f8b4003..5d347bc68 100644
--- a/package/traceroute/patches/patch-Make_rules
+++ b/package/traceroute/patches/patch-Make_rules
@@ -1,5 +1,5 @@
---- traceroute-2.0.16.orig/Make.rules 2010-09-09 16:20:46.000000000 +0200
-+++ traceroute-2.0.16/Make.rules 2010-10-11 20:07:03.000000000 +0200
+--- traceroute-2.0.19.orig/Make.rules 2012-03-27 15:49:04.000000000 +0200
++++ traceroute-2.0.19/Make.rules 2013-12-29 20:01:35.000000000 +0100
@@ -46,14 +46,14 @@ $(call set, INSTALL, cp)
$(call set, INDENT, true)
@@ -15,11 +15,11 @@
-prefix = /usr/local
+prefix = /usr
- exec_prefix = $(prefix)
- bindir = $(exec_prefix)/bin
-@@ -125,7 +125,7 @@ _libs = $(strip $(foreach lib,$(LIBDIRS)
- $(wildcard $(srcdir)/$(lib)/$(lib).so \
- $(srcdir)/$(lib)/$(lib).a))))
+ ifneq ($(wildcard /lib64/libc.* /usr/lib64/libc.*),)
+ lib := lib64
+@@ -131,7 +131,7 @@ _libs = $(strip $(foreach _lib,$(LIBDIRS
+ $(wildcard $(srcdir)/$(_lib)/$(_lib).so \
+ $(srcdir)/$(_lib)/$(_lib).a))))
-override LIBS := $(_libs) -lm $(LIBS)
+override LIBS := $(_libs) $(LIBS)