[nautilus] general: use Autoconf to perform substitution
- From: Ernestas Kulik <ernestask src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus] general: use Autoconf to perform substitution
- Date: Wed, 4 Jan 2017 15:37:34 +0000 (UTC)
commit 48cd7072a14ca75cd3dfe199ebb8c1c7e0a3a138
Author: Ernestas Kulik <ernestask src gnome org>
Date: Wed Jan 4 17:25:13 2017 +0200
general: use Autoconf to perform substitution
Variables in service files are substituted using sed, which takes more
space than a couple of lines in configure.ac.
https://bugzilla.gnome.org/show_bug.cgi?id=776796
configure.ac | 2 ++
data/Makefile.am | 8 +-------
2 files changed, 3 insertions(+), 7 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 2f2289a..da90fba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -321,6 +321,8 @@ LIBGD_INIT([
AC_CONFIG_FILES([
Makefile
data/Makefile
+data/org.freedesktop.FileManager1.service
+data/org.gnome.Nautilus.service
data/icons/Makefile
docs/Makefile
docs/reference/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index 470ee03..65e77d9 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -49,16 +49,10 @@ $(appdata_DATA): $(appdata_in_files)
$(AM_V_GEN) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@
servicedir = $(datadir)/dbus-1/services
-service_DATA = $(service_in_files:.service.in=.service)
service_in_files = \
org.freedesktop.FileManager1.service.in \
org.gnome.Nautilus.service.in
-
-org.gnome.Nautilus.service: org.gnome.Nautilus.service.in Makefile
- $(AM_V_GEN) sed -e "s|\@bindir\@|$(bindir)|" $< > $@
-
-org.freedesktop.FileManager1.service: org.freedesktop.FileManager1.service.in Makefile
- $(AM_V_GEN) sed -e "s|\@bindir\@|$(bindir)|" $< > $@
+service_DATA = $(service_in_files:.service.in=.service)
searchproviderdir = $(datadir)/gnome-shell/search-providers
searchprovider_DATA = nautilus-search-provider.ini
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]