Fix distcheck

Makefile.am

@@ -1,6 +1,8 @@
+DISTCHECK_CONFIGURE_FLAGS = --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
+
 TESTS = tests/adv tests/rec
 EXTRA_DIST = COPYING $(TESTS) [email protected] tangd.socket.in tangd-update.path.in tangd-update.service.in
-CLEANFILES = tangd.serivce tangd.socket tangd-update.path tangd-update.service
+CLEANFILES = $(systemdsystemunit_DATA)
 
 systemdsystemunit_DATA = [email protected] tangd.socket tangd-update.path tangd-update.service
 dist_libexec_SCRIPTS = tangd-update

configure.ac

@@ -24,9 +24,15 @@ AC_CHECK_LIB([http_parser], [http_parser_execute],
 PKG_CHECK_MODULES([jose_zlib], [jose-zlib >= 5])
 PKG_CHECK_MODULES([jose_openssl], [jose-openssl >= 5])
 
-PKG_CHECK_MODULES([systemd], [systemd],
-		  [AC_SUBST([systemdsystemunitdir], [$($PKG_CONFIG --variable=systemdsystemunitdir systemd)])],
-		  [AC_SUBST([systemdsystemunitdir], [${prefix}/lib/systemd/system])])
+PKG_CHECK_MODULES([systemd], [systemd])
+
+AC_ARG_WITH([systemdsystemunitdir],
+            [AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files])],
+            [],
+            [with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)])
+
+AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])
+
 
 TANG_CFLAGS="\
 -Wall \

tests/adv

@@ -18,6 +18,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+srcdir=${srcdir:-.}
+
 function on_exit() {
   if [ "$PID" ]; then kill $PID; wait $PID || true; fi
   [ -d "$TMP" ] && rm -rf $TMP
@@ -40,7 +42,7 @@ jose gen -t '{"alg": "ES256"}'                                         -o $TMP/d
 jose gen -t '{"alg": "ES256"}'                                         -o $TMP/db/.sig.jwk
 jose gen -t '{"alg": "ES256"}'                                         -o $TMP/db/.oth.jwk
 jose gen -t '{"kty": "EC", "crv": "P-256", "key_ops": ["deriveKey"] }' -o $TMP/db/exc.jwk
-./tangd-update $TMP/db $TMP/cache
+$srcdir/tangd-update $TMP/db $TMP/cache
 
 for addr in "127.0.0.1" "[::1]"; do
   port=`shuf -i 1024-65536 -n 1`

tests/rec

@@ -18,6 +18,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+srcdir=${srcdir:-.}
+
 function on_exit() {
     if [ "$PID" ]; then kill $PID; wait $PID || true; fi
     [ -d "$TMP" ] && rm -rf $TMP
@@ -39,7 +41,7 @@ mkdir -p $TMP/cache
 # Generate the server keys
 jose gen -t '{"alg": "ES256"}' -o $TMP/db/sig.jwk
 jose gen -t '{"kty": "EC", "crv": "P-256", "key_ops": ["deriveKey"] }' -o $TMP/db/exc.jwk
-./tangd-update $TMP/db $TMP/cache
+${srcdir}/tangd-update $TMP/db $TMP/cache
 
 # Generate the client keys
 exc_kid=`jose thp -i $TMP/db/exc.jwk`