X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=Makefile.in;h=c5725935e50ca98387bc59f20d7c80d6407dabf4;hb=b52f8dd1aad9dcc6012851091ebbf8a9a174f41f;hp=76d7fc463b1aa7be6be664ac167c141b38a6ffca;hpb=8e0907be1d73011075a99a0c029c56664e12843e;p=onak.git

diff --git a/Makefile.in b/Makefile.in
index 76d7fc4..c572593 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -65,7 +65,7 @@ install: $(PROGS) onak.conf $(BACKENDS)
 	install -d $(DESTDIR)/@mandir@/man1
 	install -d $(DESTDIR)/@mandir@/man8
 	install -d $(DESTDIR)/@sysconfdir@
-	install onak-mail.pl $(DESTDIR)/@libdir@/onak
+	install -m 755 onak-mail.pl $(DESTDIR)/@libdir@/onak
 	install onak splitkeys $(DESTDIR)/@bindir@
 	install onak.1 splitkeys.1 $(DESTDIR)/@mandir@/man1
 	install keyd.8 keydctl.8 onak-mail.pl.8 $(DESTDIR)/@mandir@/man8
@@ -78,7 +78,8 @@ endif
 
 keyd: keyd.o $(CORE_OBJS) keydb_$(DBTYPE).o
 	$(CC) $(LDFLAGS) $(PROGS_LDFLAGS_EXTRA) \
-		-o keyd keyd.o $(CORE_OBJS) keydb_$(DBTYPE).o $(LIBS)
+		-o keyd keyd.o $(CORE_OBJS) keydb_$(DBTYPE).o $(LIBS) \
+		@SYSTEMD_LIBS@
 
 keydctl: keydctl.o onak-conf.o ll.o log.o
 	$(CC) $(LDFLAGS) $(PROGS_LDFLAGS_EXTRA) \
@@ -149,15 +150,13 @@ onak-conf.o: onak-conf.c onak-conf.h
 keydctl.o: keydctl.c keyd.h
 	$(CC) $(CFLAGS) -DDBINIT=keydb_@DBTYPE@_init -c keydctl.c
 
-onak-mail.pl: onak-mail.pl.in
-	sed 's:@CONFIG@:@sysconfdir@/onak.conf:g' < onak-mail.pl.in > onak-mail.pl
-	chmod +x onak-mail.pl
-
-onak.conf: onak.conf.in
+%: %.in
 	sed -e 's:@BINDIR@:@bindir@:g' \
+		-e 's:@CONFIG@:@sysconfdir@/onak.conf:g' \
 		-e 's:@LIBDIR@:@libdir@:g' \
+		-e 's:@SBINDIR@:@sbindir@:g' \
 		-e 's:@STATEDIR@:@localstatedir@:g' \
-		< onak.conf.in > onak.conf
+		< $< > $@
 
 clean:
 	$(RM) $(PROGS) $(OBJS) Makefile.bak testparse maxpath *.core core \