From a62e81fcb42696c42c8d7405956f693728f922bd Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Wed, 23 Oct 2024 16:34:49 +0000 Subject: [PATCH] configure: Don't try to autodetect the systemd unit directory This no longer works on Debian Trixie and so on and I don't think there is any reason why we should not hard-code this. Signed-off-by: Michael Tremer --- Makefile.am | 4 +--- configure.ac | 6 ------ 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/Makefile.am b/Makefile.am index 2b386e50a..0df6329f7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -41,6 +41,7 @@ configsdir = $(sysconfdir)/pakfire configsdistrosdir = $(configsdir)/distros macrosdir = $(prefix)/lib/pakfire/macros scriptsdir = $(prefix)/lib/$(PACKAGE_NAME) +systemdsystemunitdir = $(prefix)/lib/systemd/system TEST_ROOTFS = $(abs_top_builddir)/tests/.root @@ -78,7 +79,6 @@ pkgpyexec_LTLIBRARIES = pkginclude_HEADERS = DISTCHECK_CONFIGURE_FLAGS = \ - --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) \ --enable-debug @INTLTOOL_POLICY_RULE@ @@ -1030,7 +1030,6 @@ upload-man: $(MANPAGES_HTML) # ------------------------------------------------------------------------------ -if HAVE_SYSTEMD systemdsystemunit_DATA = \ src/systemd/pakfire-daemon.service @@ -1039,7 +1038,6 @@ EXTRA_DIST += \ CLEANFILES += \ src/systemd/pakfire-daemon.service -endif # ------------------------------------------------------------------------------ diff --git a/configure.ac b/configure.ac index 5fc639f75..40a2cdeb5 100644 --- a/configure.ac +++ b/configure.ac @@ -302,12 +302,6 @@ save_LIBS="$LIBS" LIBS="$save_LIBS" -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]) -AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$with_systemdsystemunitdir"]) - # Check if cURL has support for WebSockets AC_CHECK_PROG(CURL_CONFIG, curl-config, curl-config) if test "$CURL_CONFIG" != ""; then -- 2.47.3