From 2671a349c712ac7d0c0f8cd3f4ede13434859d6d Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Tue, 4 Oct 2016 17:30:57 +0200 Subject: build: Unify default values for PREFIX and ETCDIR in configure The netsniff-ng make system is no longer usable without the `Config' file generated by the ^configure' script. Thus it's now possible to move default value definitions for PREFIX and ETCDIR to the configure script, so we they're not duplicated in `configure' and the Makefile. Signed-off-by: Tobias Klauser --- Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index ad1c1fc..fbb50cc 100644 --- a/Makefile +++ b/Makefile @@ -20,10 +20,9 @@ EXTRAVERSION = NAME = aisatsana TOOLS ?= $(CONFIG_TOOLS) -TOOLS ?= netsniff-ng trafgen astraceroute flowtop ifpps bpfc curvetun mausezahn # For packaging purposes, prefix can define a different path. -PREFIX ?= /usr/local +PREFIX ?= $(CONFIG_PREFIX) # Set to use ccache for compilation CCACHE ?= @@ -35,7 +34,7 @@ DESTDIR= # Location of installation paths. SBINDIR = $(PREFIX)/sbin INCDIR = $(PREFIX)/include -ETCDIR ?= /etc +ETCDIR ?= $(CONFIG_ETCDIR) ETCDIRE = $(ETCDIR)/netsniff-ng MAN8DIR = $(PREFIX)/share/man/man8 -- cgit v1.2.3-54-g00ecf