From a1d94bad6b1e968b27c0213d7f4a38239d3dfd3f Mon Sep 17 00:00:00 2001 From: Daniel Borkmann Date: Fri, 18 Jan 2013 18:29:15 +0100 Subject: [PATCH] move scripts into contrib as well, since they are only helpers, not core Signed-off-by: Daniel Borkmann --- {scripts => contrib/scripts}/astraceroute6 | 0 {scripts => contrib/scripts}/bpf.vim | 0 {scripts => contrib/scripts}/curvetun-ldap | 0 {scripts => contrib/scripts}/geoip-database-update | 0 {scripts => contrib/scripts}/update-oui.py | 0 {scripts => contrib/scripts}/view-rtp-avg.py | 0 src/Makefile | 4 ++-- 7 files changed, 2 insertions(+), 2 deletions(-) rename {scripts => contrib/scripts}/astraceroute6 (100%) rename {scripts => contrib/scripts}/bpf.vim (100%) rename {scripts => contrib/scripts}/curvetun-ldap (100%) rename {scripts => contrib/scripts}/geoip-database-update (100%) rename {scripts => contrib/scripts}/update-oui.py (100%) rename {scripts => contrib/scripts}/view-rtp-avg.py (100%) diff --git a/scripts/astraceroute6 b/contrib/scripts/astraceroute6 similarity index 100% rename from scripts/astraceroute6 rename to contrib/scripts/astraceroute6 diff --git a/scripts/bpf.vim b/contrib/scripts/bpf.vim similarity index 100% rename from scripts/bpf.vim rename to contrib/scripts/bpf.vim diff --git a/scripts/curvetun-ldap b/contrib/scripts/curvetun-ldap similarity index 100% rename from scripts/curvetun-ldap rename to contrib/scripts/curvetun-ldap diff --git a/scripts/geoip-database-update b/contrib/scripts/geoip-database-update similarity index 100% rename from scripts/geoip-database-update rename to contrib/scripts/geoip-database-update diff --git a/scripts/update-oui.py b/contrib/scripts/update-oui.py similarity index 100% rename from scripts/update-oui.py rename to contrib/scripts/update-oui.py diff --git a/scripts/view-rtp-avg.py b/contrib/scripts/view-rtp-avg.py similarity index 100% rename from scripts/view-rtp-avg.py rename to contrib/scripts/view-rtp-avg.py diff --git a/src/Makefile b/src/Makefile index ebb4c246..77511f62 100644 --- a/src/Makefile +++ b/src/Makefile @@ -252,7 +252,7 @@ netsniff-ng_install_custom flowtop_install_custom: $(Q)$(foreach file,$(NCONF_FILES),$(call INST,configs/$(file),$(ETCDIRE));) astraceroute_install_custom: $(Q)$(call INST,configs/whois.conf,$(ETCDIRE)) - $(Q)$(call INSTX,../scripts/astraceroute6,$(SBINDIR)) + $(Q)$(call INSTX,../contrib/scripts/astraceroute6,$(SBINDIR)) $(TOOLS): WFLAGS += $(WFLAGS_EXTRA) $(TOOLS): @@ -260,7 +260,7 @@ $(TOOLS): $(STRIP) $@/$@ update: - $(Q)../scripts/geoip-database-update + $(Q)../contrib/scripts/geoip-database-update nacl: $(Q)echo "$(bold)$(WHAT) $@:$(normal)" $(Q)cd curvetun/ && ./build_nacl.sh ~/nacl -- 2.11.4.GIT