From 15b35deec06efa6efc5e527fa2c277c581caf009 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@sbcglobal.net>
Date: Wed, 15 Jun 2016 20:20:07 -0400
Subject: tidy systemd stuff

---
 Makefile | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 80031c7..b03c431 100644
--- a/Makefile
+++ b/Makefile
@@ -20,12 +20,12 @@
 # <http://www.gnu.org/licenses/>.
 
 PACKAGE = parabola-hackers
-systemddir = $(libdir)/systemd
+sysusersdir=$(prefix)/lib/sysusers.d
+systemunitdir=$(prefix)/lib/systemd/system
 conf_file = $(sysconfdir)/$(PACKAGE).yml
 NET ?=
 #NET ?= FORCE
 user = nshd
-group = nshd
 CFLAGS = -Wall -Wextra -Werror -pedantic
 CC = gcc -std=c99
 
@@ -39,12 +39,12 @@ CGO_ENABLED = 1
 
 at.subdirs += src/lukeshu.com/git/go/libnslcd.git/proto
 
-scripts = $(notdir $(wildcard $(srcdir)/scripts/*))
+scripts = $(filter-out common.rb common.rb.in,$(notdir $(wildcard $(srcdir)/scripts/*))) common.rb
 
 std.gen_files += LICENSE.lgpl-2.1.txt LICENSE.gpl-2.txt LICENSE.apache-2.0.txt
-std.out_files += bin/nshd nshd.service nshd.socket test/runner
-std.sys_files += $(addprefix $(bindir)/,nshd $(scripts)) $(systemddir)/system/nshd.socket $(systemddir)/system/nshd.service
-std.clean_files += test/*.o pkg/
+std.out_files += bin/nshd nshd.service nshd.sysusers scripts/common.rb test/runner
+std.sys_files += $(addprefix $(bindir)/,nshd $(scripts)) $(systemunitdir)/nshd.socket $(systemunitdir)/nshd.service $(sysusersdir)/nshd.conf $(conf_file)
+std.clean_files += test/*.o pkg/ .tmp* .var*
 
 $(srcdir)/LICENSE.lgpl-2.1.txt: $(NET)
 	curl https://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt > $@
@@ -69,8 +69,9 @@ $(outdir)/%: $(outdir)/%.o $(var)CC $(var)LDFLAGS
 
 $(outdir)/%: $(srcdir)/%.in
 	< $< sed $(foreach v,$(patsubst $(var)%,%,$(filter $(var)%,$^)), -e 's|@$v@|$($v)|g' ) > $@
-$(outdir)/nshd.service: $(var)user $(var)group $(var)bindir
-$(outdir)/nshd.socket:  $(var)user $(var)group
+$(outdir)/nshd.service: $(var)user $(var)bindir
+$(outdir)/nshd.sysusers: $(var)user
+$(outdir)/scripts/common.rb: $(var)conf_file
 
 $(DESTDIR)$(bindir)/%: $(outdir)/bin/%
 	install -TDm755 $< $@
@@ -78,9 +79,13 @@ $(DESTDIR)$(bindir)/%: $(srcdir)/scripts/%
 	install -TDm755 $< $@
 $(DESTDIR)$(bindir)/common.rb: $(srcdir)/scripts/common.rb
 	install -TDm644 $< $@
-$(DESTDIR)$(systemddir)/system/%.socket: $(outdir)/%.socket
+$(DESTDIR)$(systemunitdir)/%.socket: $(outdir)/%.socket
 	install -TDm644 $< $@
-$(DESTDIR)$(systemddir)/system/%.service: $(outdir)/%.service
+$(DESTDIR)$(systemunitdir)/%.service: $(outdir)/%.service
+	install -TDm644 $< $@
+$(DESTDIR)$(sysusersdir)/%.conf: $(outdir)/%.sysusers
+	install -TDm644 $< $@
+$(DESTDIR)$(conf_file): $(srcdir)/parabola-hackers.yml
 	install -TDm644 $< $@
 
 .PHONY: FORCE
-- 
cgit v1.2.3