Bump Debian Standards-Version to 3.9.6.0

[onak.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index da116ac19ca25baad2f39c0dd1689319c397a1b4..c5725935e50ca98387bc59f20d7c80d6407dabf4 100644 (file)
--- 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) \
@@ -142,22 +143,20 @@ onak: onak.o cleankey.o $(CORE_OBJS) $(KEYDB_OBJ)
 
 onak-conf.o: onak-conf.c onak-conf.h
        $(CC) $(CFLAGS) -DCONFIGFILE=\"@sysconfdir@/onak.conf\" \
-               -DDBFUNCS=keydb_@DBTYPE@_funcs -c onak-conf.c
+               -DDBINIT=keydb_@DBTYPE@_init -c onak-conf.c
 
 # HACK: onak-conf.o needs to be able to see keydb_@DBTYPE@_funcs, but
 # keydctl doesn't want to link against the DB stuff. To be fixed more cleanly.
 keydctl.o: keydctl.c keyd.h
-       $(CC) $(CFLAGS) -DDBFUNCS=keydb_@DBTYPE@_funcs -c keydctl.c
+       $(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 \