mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-07-13 11:19:50 +03:00
5bd1ad161a
I don't use this myself, yet, but I'm sure it's useful to someone and, if there are any issues, they can be assigned to me and we'll sort them out together
93 lines
2.7 KiB
Diff
93 lines
2.7 KiB
Diff
Reason: Remove installation of systemd service file
|
|
Upstream: No
|
|
|
|
diff --git a/Makefile.am b/Makefile.am
|
|
index dc4174f..e9011fe 100644
|
|
--- a/Makefile.am
|
|
+++ b/Makefile.am
|
|
@@ -112,33 +112,6 @@ EXTRA_DIST += \
|
|
.svg.o:
|
|
$(LD) -r -b binary -o $@ $<
|
|
|
|
-#
|
|
-# unit file
|
|
-#
|
|
-install-data-hook: install-systemd-service
|
|
-uninstall-hook: uninstall-systemd-service
|
|
-
|
|
-CLEANFILES += $(top_builddir)/usbguard-notifier.service
|
|
-
|
|
-#
|
|
-# Notifier service
|
|
-#
|
|
-EXTRA_DIST += \
|
|
- $(top_srcdir)/usbguard-notifier.service.in
|
|
-
|
|
-usbguard-notifier.service: $(top_srcdir)/usbguard-notifier.service.in
|
|
- $(SED) -e "s|%bindir%|${bindir}|" $^ > $@ || rm -f $@
|
|
-
|
|
-install-systemd-service: $(top_builddir)/usbguard-notifier.service
|
|
- $(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR)
|
|
- $(INSTALL) -m 644 $(top_builddir)/usbguard-notifier.service \
|
|
- $(DESTDIR)$(SYSTEMD_UNIT_DIR)/usbguard-notifier.service
|
|
-
|
|
-uninstall-systemd-service:
|
|
- rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/usbguard-notifier.service
|
|
-
|
|
-CLEANFILES += $(top_builddir)/usbguard-notifier.service
|
|
-
|
|
#
|
|
# Common defines
|
|
#
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 42dd859..25461cf 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -81,16 +81,6 @@ AC_ARG_ENABLE([notifier-cli],
|
|
[notifier_cli_enabled=yes]
|
|
)
|
|
|
|
-AC_ARG_ENABLE([systemd-systemunitdir],
|
|
- [AC_HELP_STRING([--enable-systemd-systemunitdir], [enable systemd system unit dir(default=no)])],
|
|
- [case "${enableval}" in
|
|
- yes) systemd_systemunitdir=yes;;
|
|
- no) systemd_systemunitdir=no;;
|
|
- *) AC_MSG_ERROR([bad value ${enableval} for --enable-systemd-systemunitdir]) ;;
|
|
- esac],
|
|
- [systemd_systemunitdir=no]
|
|
-)
|
|
-
|
|
# librsvg2
|
|
PKG_CHECK_MODULES(
|
|
[rsvg],
|
|
@@ -113,20 +103,6 @@ if test -z "$A2X"; then
|
|
AC_MSG_FAILURE([Cannot detect documentation generator (asciidoc / a2x)])
|
|
fi
|
|
|
|
-# systemd
|
|
-if test "x$systemd_systemunitdir" = xyes; then
|
|
- systemd_unit_dir="`$PKG_CONFIG systemd --variable=systemdsystemunitdir`"
|
|
-else
|
|
- systemd_unit_dir="`$PKG_CONFIG systemd --variable=systemduserunitdir`"
|
|
-fi
|
|
-
|
|
-if test "x$systemd_unit_dir" = x; then
|
|
- AC_MSG_FAILURE([Cannot detect the systemd system unit dir])
|
|
-fi
|
|
-AC_SUBST(SYSTEMD_UNIT_DIR, $systemd_unit_dir)
|
|
-AC_DEFINE([SYSTEMD_SUPPORT_ENABLED], [1], [Enable systemd support int the project])
|
|
-AM_CONDITIONAL([SYSTEMD_SUPPORT_ENABLED], [test "x$systemd" = xyes ])
|
|
-
|
|
# Catch C++ library
|
|
AC_ARG_WITH([bundled-catch], AS_HELP_STRING([--with-bundled-catch],
|
|
[Build using the bundled Catch library]),
|
|
@@ -189,9 +165,6 @@ AC_CONFIG_FILES([
|
|
|
|
AC_OUTPUT
|
|
|
|
-echo ""
|
|
-echo "============== MACROS ================="
|
|
-echo " systemd: $systemd_unit_dir"
|
|
echo ""
|
|
echo "========== LINKER OPTIONS ============="
|
|
echo " Catch: $catch_summary"
|