Install: allow specifying sbin and man directories.

diff --git a/doc/manpages/Makefile b/doc/manpages/Makefile
index 16a0237b6daf08a1ccd687eb53ae5177c5639766..46d95c6cb00b0ac6299ee60ec7fa7b5082ebc2b9 100644 (file)
--- a/doc/manpages/Makefile
+++ b/doc/manpages/Makefile
@@ -1,3 +1,3 @@
 install:
-       mkdir -p "$(DESTDIR)/usr/share/man/man8"
-       cp dinit.8 dinitctl.8 "$(DESTDIR)/usr/share/man/man8"
+       mkdir -p "$(DESTDIR)$(MANDIR)/man8"
+       install dinit.8 dinitctl.8 "$(DESTDIR)$(MANDIR)/man8"

diff --git a/mconfig b/mconfig
index fed7a66b2d48317c06908bfab7838d155d54141d..b4ed4b95a0d6c9ecc8141cbb39aa7799b836a9f0 100644 (file)
--- a/mconfig
+++ b/mconfig
@@ -1,3 +1,11 @@
+# Installation path options.
+
+SBINDIR=/sbin
+MANDIR=/usr/share/man
+
+
+# General build options. Uncomment the options appropriate for your system.
+
 # Linux (GCC). Note with GCC 5.x/6.x you must use the old ABI, with GCC 7.x you must use
 # the new ABI. See BUILD file for more information.
 CXX=g++
@@ -6,7 +14,7 @@ EXTRA_LIBS=
 BUILD_SHUTDOWN=yes
 SANITIZEOPTS=-fsanitize=address,undefined
 
-# OpenBSD, tested with GCC 4.9.3 and gmake:
+# OpenBSD, tested with GCC 4.9.3 / Clang++ 4/5 and gmake:
 #CXX=clang++
 #CXXOPTS=-std=gnu++11 -Os -Wall -fno-rtti
 #EXTRA_LIBS=

diff --git a/src/Makefile b/src/Makefile
index 04c8116a8dcda7db84246e556340bd90f95f9298..54ad5d9633d97e5ed9acc76719c9fb7c9d1134ce 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -26,10 +26,10 @@ check: $(dinit_objects)
        $(MAKE) -C tests check
 
 install: all
-       install -d $(DESTDIR)/sbin
-       install -s dinit dinitctl $(SHUTDOWN) $(DESTDIR)/sbin
+       install -d $(DESTDIR)$(SBINDIR)
+       install -s dinit dinitctl $(SHUTDOWN) $(DESTDIR)$(SBINDIR)
 ifeq ($(BUILD_SHUTDOWN),yes)
-       install halt reboot $(DESTDIR)/sbin
+       install halt reboot $(DESTDIR)$(SBINDIR)
 endif
 
 clean: