diff options
| author | Gaël Bonithon <gael@xfce.org> | 2022-01-09 21:04:31 +0100 |
|---|---|---|
| committer | Gaël Bonithon <gael@xfce.org> | 2022-01-09 22:40:44 +0100 |
| commit | 7c7bd60f329e351ebdc02c5268364539d8197d29 (patch) | |
| tree | f3d70745d9c0b67c90a65b9edcfcc3f87ff534d2 | |
| parent | b075248d977a6491a6f0f63f5bc67cdb16c3a0f8 (diff) | |
| download | tumbler-7c7bd60f329e351ebdc02c5268364539d8197d29.tar.gz | |
Rename service files according to the chosen service name prefix
Completes previous commit, related to !21.
| -rw-r--r-- | configure.ac | 7 | ||||
| -rw-r--r-- | tumblerd/Makefile.am | 10 |
2 files changed, 14 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index ddf1e9a..5917ba8 100644 --- a/configure.ac +++ b/configure.ac @@ -159,7 +159,12 @@ dnl *** Alternative service name prefix for e.g. Flatpak packaging *** dnl ****************************************************************** AC_ARG_VAR([TUMBLER_SERVICE_NAME_PREFIX], [Alternative prefix to org.freedesktop.thumbnails for Tumbler services]) -test -n "$TUMBLER_SERVICE_NAME_PREFIX" || TUMBLER_SERVICE_NAME_PREFIX='org.freedesktop.thumbnails' +if test -z "$TUMBLER_SERVICE_NAME_PREFIX"; then + TUMBLER_SERVICE_NAME_PREFIX='org.freedesktop.thumbnails' + AC_SUBST([TUMBLER_SERVICE_FILENAME_PREFIX], [org.xfce.Tumbler]) +else + AC_SUBST([TUMBLER_SERVICE_FILENAME_PREFIX], [$TUMBLER_SERVICE_NAME_PREFIX]) +fi AC_SUBST([TUMBLER_SERVICE_PATH_PREFIX], [$(printf '%s' $TUMBLER_SERVICE_NAME_PREFIX | $SED -E 's%(^|\.)%/%g')]) diff --git a/tumblerd/Makefile.am b/tumblerd/Makefile.am index 5eb0dbc..4836bf6 100644 --- a/tumblerd/Makefile.am +++ b/tumblerd/Makefile.am @@ -92,7 +92,7 @@ service_in_files = \ org.xfce.Tumbler.Manager1.service.in \ org.xfce.Tumbler.Thumbnailer1.service.in -service_DATA = $(service_in_files:.service.in=.service) +service_DATA = $(service_in_files:org.xfce.Tumbler.%.service.in=@TUMBLER_SERVICE_FILENAME_PREFIX@.%.service) systemd_userdir = $(prefix)/lib/systemd/user systemd_user_in_files = tumblerd.service.in @@ -106,7 +106,13 @@ dbus_xml_in_files = \ dbus_xml_files = $(dbus_xml_in_files:.xml.in=.xml) -%.service: %.service.in +@TUMBLER_SERVICE_FILENAME_PREFIX@.%.service: org.xfce.Tumbler.%.service.in + $(SED) -e "s,\@libdir\@,$(libdir),g" \ + -e "s,\@TUMBLER_VERSION_API\@,$(TUMBLER_VERSION_API),g" \ + -e "s,\@TUMBLER_SERVICE_NAME_PREFIX\@,$(TUMBLER_SERVICE_NAME_PREFIX),g" \ + -e "s,\@TUMBLER_SERVICE_PATH_PREFIX\@,$(TUMBLER_SERVICE_PATH_PREFIX),g" < $< > $@ + +tumblerd.service: tumblerd.service.in $(SED) -e "s,\@libdir\@,$(libdir),g" \ -e "s,\@TUMBLER_VERSION_API\@,$(TUMBLER_VERSION_API),g" \ -e "s,\@TUMBLER_SERVICE_NAME_PREFIX\@,$(TUMBLER_SERVICE_NAME_PREFIX),g" \ |