[nautilus] Revert "general: use Autoconf to perform substitution"
- From: Ernestas Kulik <ernestask src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus] Revert "general: use Autoconf to perform substitution"
- Date: Wed, 4 Jan 2017 22:05:00 +0000 (UTC)
commit ecb7f992f55c901d953ba88059db91019a2f9d15
Author: Ernestas Kulik <ernestask src gnome org>
Date: Thu Jan 5 00:04:43 2017 +0200
Revert "general: use Autoconf to perform substitution"
This reverts commit 48cd7072a14ca75cd3dfe199ebb8c1c7e0a3a138.
configure.ac | 2 --
data/Makefile.am | 8 +++++++-
2 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index da90fba..2f2289a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -321,8 +321,6 @@ 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 351f4db..9eeb144 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -49,10 +49,16 @@ $(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
-service_DATA = $(service_in_files:.service.in=.service)
+
+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)|" $< > $@
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]