Daemons should be in sbin, make destination variables overridable

diff --git a/Makefile b/Makefile
index b742b74ea2b8576fe426f645b023aeae4ce42602..af72092b308e1787b655b39938780e5c53f81c18 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -77,6 +77,7 @@ info:
        $(info PREFIX:     $(PREFIX))
        $(info DESTDIR:    $(DESTDIR))
        $(info BINDIR:     $(BINDIR))
+       $(info SBINDIR:    $(SBINDIR))
        $(info LIBDIR:     $(LIBDIR))
        $(info ETCDIR:     $(ETCDIR))
        $(info INCLUDEDIR: $(INCLUDEDIR))

diff --git a/config.mk b/config.mk
index cb637444493b95ea269952729fd46ef6d5c75910..3ad0f4f694dfd6a12dd06e2df1558c565913805a 100644 (file)
--- a/config.mk
+++ b/config.mk
@@ -7,12 +7,13 @@ BUILDMODE := dynamic
 HARDENING := yes
 
 # Paths
-PREFIX := /usr/local
-BINDIR := $(PREFIX)/bin
-LIBDIR := $(PREFIX)/lib
-INCLUDEDIR := $(PREFIX)/include
-MODULEDIR := $(LIBDIR)/kdns_modules
-ETCDIR := $(PREFIX)/etc/kresd
+PREFIX ?= /usr/local
+BINDIR ?= $(PREFIX)/bin
+SBINDIR ?= $(PREFIX)/sbin
+LIBDIR ?= $(PREFIX)/lib
+INCLUDEDIR ?= $(PREFIX)/include
+MODULEDIR ?= $(LIBDIR)/kdns_modules
+ETCDIR ?= $(PREFIX)/etc/kresd
 
 # Tools
 CC     ?= cc

diff --git a/daemon/daemon.mk b/daemon/daemon.mk
index d25de2ec344e1b9aaef87ccbd8a7740cc2682afd..77b6f3bf4e9c35e58f5561599b64117339570baf 100644 (file)
--- a/daemon/daemon.mk
+++ b/daemon/daemon.mk
@@ -35,7 +35,7 @@ endif
 
 # Make binary
 ifeq ($(HAS_lua)|$(HAS_libuv), yes|yes)
-$(eval $(call make_bin,kresd,daemon,yes))
+$(eval $(call make_sbin,kresd,daemon,yes))
 endif
 
 # Targets

diff --git a/doc/build.rst b/doc/build.rst
index db5463c5f0e7fad4b3855d32af0b1b41e0fa9453..f908b852f18b29b784cc73bb516cd61839605f0d 100644 (file)
--- a/doc/build.rst
+++ b/doc/build.rst
@@ -152,7 +152,7 @@ All paths are prefixed with ``PREFIX`` variable by default if not specified othe
    :header: "Component", "Variable", "Default", "Notes"
 
    "library", "``LIBDIR``", "``$(PREFIX)/lib``", "pkg-config is auto-generated [#]_"
-   "daemon",  "``BINDIR``", "``$(PREFIX)/bin``", ""
+   "daemon",  "``SBINDIR``", "``$(PREFIX)/sbin``", ""
    "configuration", "``ETCDIR``", "``$(PREFIX)/etc/kresd``", "Configuration file, templates."
    "modules", "``MODULEDIR``", "``$(LIBDIR)/kdns_modules``", "[#]_"
    "work directory", "", "``$(PREFIX)/var/run/kresd``", "Run directory for daemon."

diff --git a/platform.mk b/platform.mk
index de0a4d7773d883692e44ddeb0f7e298aed9e7f6f..4c7b7eb1981fa95fec067559bd7e7d6e3e46ffc8 100644 (file)
--- a/platform.mk
+++ b/platform.mk
@@ -120,6 +120,7 @@ endef
 
 # Make targets (name,path,amalgable yes|no,abiver)
 make_bin = $(call make_target,$(1),$(2),$(BINEXT),$(BINFLAGS),$(BINDIR),$(3))
+make_sbin = $(call make_target,$(1),$(2),$(BINEXT),$(BINFLAGS),$(SBINDIR),$(3))
 make_lib = $(call make_target,$(1),$(2),$(LIBEXT),-$(LIBTYPE),$(LIBDIR),$(3),$(4))
 make_module = $(call make_target,$(1),$(2),$(LIBEXT),-$(LIBTYPE),$(MODULEDIR),$(3))
 make_shared = $(call make_target,$(1),$(2),$(MODEXT),-$(MODTYPE),$(LIBDIR),$(3))