]> git.ipfire.org Git - pakfire.git/commitdiff
configure: Don't try to autodetect the systemd unit directory
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 23 Oct 2024 16:34:49 +0000 (16:34 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 23 Oct 2024 16:35:39 +0000 (16:35 +0000)
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 <michael.tremer@ipfire.org>
Makefile.am
configure.ac

index 2b386e50abd5fd3880f07f7a10f330fdd1ff274d..0df6329f7077efdd9440fe601ae1897805c015d5 100644 (file)
@@ -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
 
 # ------------------------------------------------------------------------------
 
index 5fc639f75f639f24e0360f5f2a077bc185ae3c6f..40a2cdeb56d24a37d6980caba3a31c4f5bc8b2a4 100644 (file)
@@ -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