control.sh: support sbin and libexec dirs

All of the other GNU autoconf variables could be supported in the same
way, eventually.

2 files changed, 23 insertions, 4 deletions

diff --git a/Makefile b/Makefile
index 43b72aa..d3f6cfd 100644
--- a/Makefile
+++ b/Makefile
@@ -3,8 +3,16 @@
 prefix ?= /usr/local
 exec_prefix ?= $(prefix)
 bindir ?= $(exec_prefix)/bin
+sbindir ?= $(exec_prefix)/sbin
+libexecdir ?= $(exec_prefix)/libexec
+export prefix exec_prefix bindir sbindir libexecdir
+
 bin_PROGRAMS := $(wildcard bin/*)
-export prefix exec_prefix bindir bin_PROGRAMS
+sbin_PROGRAMS := $(wildcard sbin/*)
+libexec_PROGRAMS := $(wildcard libexec/*)
+
+PROGRAMS = $(bin_PROGRAMS) $(sbin_PROGRAMS) $(libexec_PROGRAMS)
+export PROGRAMS bin_PROGRAMS sbin_PROGRAMS libexec_PROGRAMS
 
 include src/control.mk
 
@@ -12,7 +20,16 @@ DD_USER = dyndns
 DD_GROUP = dyndns
 
 
+define install_programs
+        $(if $($(1)_PROGRAMS),install -t $($(1)dir) $($(1)_PROGRAMS),@: skip install $1 (no files))
+
+endef
+
+all_programs = bin sbin libexec
 
+define install_all_programs
+        $(foreach x,$(all_programs),$(call install_programs,$(x)))
+endef
 
 .PHONY: all install clean
 
@@ -20,11 +37,11 @@ all: control
 
 clean: clean-equivs
 
-install: equivs-stamp $(bin_PROGRAMS)
+install: equivs-stamp $(PROGRAMS)
 ifneq ($(shell id -u),0)
         @sudo $(MAKE) MAKEFLAGS=$(MAKEFLAGS) $@
 else
-        install $(bin_PROGRAMS) $(bindir)/
+        $(call install_all_programs)
         getent passwd $(DD_USER) || useradd --system --create-home $(DD_USER)
         @chown -v root:$(DD_GROUP) /etc/powerdns
         @chown -v pdns:$(DD_GROUP) /etc/powerdns/powerdns.sqlite3
diff --git a/src/control.sh b/src/control.sh
index ea5fa97..3491955 100755
--- a/src/control.sh
+++ b/src/control.sh
@@ -13,10 +13,12 @@ Origin: ${ORIGIN}
 Maintainer: ${MAINTAINER}
 END
 
+# See https://www.gnu.org/prep/standards/html_node/Directory-Variables.html
+
 if [ "$exec_prefix" ]
 then
   set --
-  for f in bin/*
+  for f in bin/* sbin/* libexec/*
   do
     if [ -f "$f" ]
     then set -- "$@" "$f ${exec_prefix}"