Merge branch 'ikev1-transform-nr'

[thirdparty/strongswan.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 47e9e8ce65f2dc4b5b1611e49b8762213b04921d..958edc6fe2d19d0fddc7b38e9157d262deaf1fa0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,6 +24,11 @@ config_includedir = $(ipseclibdir)/include
 nodist_config_include_HEADERS = config.h
 endif
 
+# we can't (and shouldn't) install/uninstall system files during make distcheck,
+# so override the autodetected path for systemd units
+AM_DISTCHECK_CONFIGURE_FLAGS = \
+       --with-systemdsystemunitdir='$$(prefix)/lib/systemd/system'
+
 # we leave config files behind intentionally so prevent distcheck from complaining
 distuninstallcheck_listfiles = find . -type f \! -name '*.conf' \! -name '*.secrets' -print
 
@@ -59,7 +64,7 @@ cov-report:
                lcov -c -o $(top_builddir)/coverage/coverage.info -d $(top_builddir) \
                         --rc lcov_branch_coverage=1
                lcov -r $(top_builddir)/coverage/coverage.info '*/tests/*' '*/suites/*' '/usr*' \
-                        -o $(top_builddir)/coverage/coverage.cleaned.info \
+                        -o $(abs_top_builddir)/coverage/coverage.cleaned.info \
                         --rc lcov_branch_coverage=1
                genhtml --num-spaces 4 --legend --branch-coverage --ignore-errors source \
                                -t "$(PACKAGE_STRING)" \