diff options
| author | Ernestas Kulik <ernestask@src.gnome.org> | 2017-01-05 00:04:43 +0200 |
|---|---|---|
| committer | Ernestas Kulik <ernestask@src.gnome.org> | 2017-01-05 00:04:43 +0200 |
| commit | ecb7f992f55c901d953ba88059db91019a2f9d15 (patch) | |
| tree | 92befeaf359dc7ad5f2124db123df3d86252e9b9 | |
| parent | 5b8a99fa395ee233f40671bb915e702a8e5ceb04 (diff) | |
| download | nautilus-ecb7f992f55c901d953ba88059db91019a2f9d15.tar.gz | |
Revert "general: use Autoconf to perform substitution"
This reverts commit 48cd7072a14ca75cd3dfe199ebb8c1c7e0a3a138.
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | data/Makefile.am | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index da90fba75..2f2289a88 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 351f4dbb4..9eeb14499 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 |