From be468e9659bc275c3e35a71b847f23a2e498d3d8 Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Sun, 14 Aug 2022 19:44:46 +0200 Subject: Add CMakeLists.txt files --- data/CMakeLists.txt | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 data/CMakeLists.txt (limited to 'data') diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt new file mode 100644 index 0000000..20245cd --- /dev/null +++ b/data/CMakeLists.txt @@ -0,0 +1,12 @@ +# ayatana-indicator-printers.service +pkg_check_modules (SYSTEMD systemd) + +if (${SYSTEMD_FOUND}) + pkg_get_variable (SYSTEMD_USER_DIR systemd systemduserunitdir) + configure_file ("${CMAKE_CURRENT_SOURCE_DIR}/ayatana-indicator-printers.service.in" "${CMAKE_CURRENT_BINARY_DIR}/ayatana-indicator-printers.service" @ONLY) + install (FILES "${CMAKE_CURRENT_BINARY_DIR}/ayatana-indicator-printers.service" DESTINATION "${SYSTEMD_USER_DIR}") +endif () + +# ayatana-indicator-printers.desktop +configure_file ("${CMAKE_CURRENT_SOURCE_DIR}/ayatana-indicator-printers.desktop.in" "${CMAKE_CURRENT_BINARY_DIR}/ayatana-indicator-printers.desktop" @ONLY) +install (FILES "${CMAKE_CURRENT_BINARY_DIR}/ayatana-indicator-printers.desktop" DESTINATION "/etc/xdg/autostart") -- cgit v1.2.3 From 7d9327a7a9e258c38e7fa4bf91ee61924c20f30d Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Sun, 14 Aug 2022 19:49:08 +0200 Subject: Use CMake variables in configurable files --- data/ayatana-indicator-printers.desktop.in | 2 +- data/ayatana-indicator-printers.service.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'data') diff --git a/data/ayatana-indicator-printers.desktop.in b/data/ayatana-indicator-printers.desktop.in index e0f74b0..1027096 100644 --- a/data/ayatana-indicator-printers.desktop.in +++ b/data/ayatana-indicator-printers.desktop.in @@ -1,7 +1,7 @@ [Desktop Entry] Type=Application Name=Ayatana Indicator Printers -Exec=@pkglibexecdir@/ayatana-indicator-printers-service +Exec=@CMAKE_INSTALL_FULL_LIBEXECDIR@/ayatana-indicator-printers/ayatana-indicator-printers-service OnlyShowIn=MATE;XFCE;Budgie NoDisplay=true StartupNotify=false diff --git a/data/ayatana-indicator-printers.service.in b/data/ayatana-indicator-printers.service.in index 781f3e6..e482f96 100644 --- a/data/ayatana-indicator-printers.service.in +++ b/data/ayatana-indicator-printers.service.in @@ -4,7 +4,7 @@ PartOf=graphical-session.target PartOf=ayatana-indicators.target [Service] -ExecStart=@pkglibexecdir@/ayatana-indicator-printers-service +ExecStart=@CMAKE_INSTALL_FULL_LIBEXECDIR@/ayatana-indicator-printers/ayatana-indicator-printers-service Restart=on-failure [Install] -- cgit v1.2.3 From f487079db3dc94c0b9c80d69430d163a6f388996 Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Sun, 14 Aug 2022 20:20:05 +0200 Subject: Drop Automake files --- data/Makefile.am | 34 ---------------------------------- 1 file changed, 34 deletions(-) delete mode 100644 data/Makefile.am (limited to 'data') diff --git a/data/Makefile.am b/data/Makefile.am deleted file mode 100644 index 8bf680d..0000000 --- a/data/Makefile.am +++ /dev/null @@ -1,34 +0,0 @@ -BUILT_SOURCES= -CLEANFILES= -EXTRA_DIST= - -# -# the systemd unit file -# - -#if defined(HAVE_SYSTEMD) -systemddir = $(SYSTEMD_USERDIR) -systemd_DATA = ayatana-indicator-printers.service -systemd_in = $(systemd_DATA:.service=.service.in) -$(systemd_DATA): $(systemd_in) - $(AM_V_GEN) $(SED) -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@ -BUILT_SOURCES += $(systemd_DATA) -EXTRA_DIST += $(systemd_in) -CLEANFILES += $(systemd_DATA) -#endif - -# -# the xdg autostart job file -# - -xdg_autostartdir = /etc/xdg/autostart -xdg_autostart_DATA = ayatana-indicator-printers.desktop -xdg_autostart_in = $(xdg_autostart_DATA:.desktop=.desktop.in) -$(xdg_autostart_DATA): $(xdg_autostart_in) - $(AM_V_GEN) $(SED) -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@ -BUILT_SOURCES += $(xdg_autostart_DATA) -CLEANFILES += $(xdg_autostart_DATA) -EXTRA_DIST += $(xdg_autostart_in) - -DISTCLEANFILES = \ - Makefile.in -- cgit v1.2.3