[gvfs] Revert "build: Use generators placeholders"

[Ondrej Holy <oholy src gnome org>]

commit 2a42f8318f3c2e3f591addf02eb884db98f66201
Author: Ondrej Holy <oholy redhat com>
Date:   Mon Jan 7 17:44:10 2019 +0100

    Revert "build: Use generators placeholders"
    
    This reverts commit dc34f1be6a3c1fa6d5615ad5d647003e7ce3196f.

 daemon/meson.build   | 12 +++++++-----
 metadata/meson.build |  2 +-
 monitor/meson.build  |  2 +-
 test/meson.build     |  8 +++++---
 4 files changed, 14 insertions(+), 10 deletions(-)
---
diff --git a/daemon/meson.build b/daemon/meson.build
index e803a743..a219fc13 100644
--- a/daemon/meson.build
+++ b/daemon/meson.build
@@ -10,7 +10,7 @@ if install_systemd_systemduserunitdir
 
   configure_file(
     input: service + '.in',
-    output: '@BASENAME@',
+    output: service,
     configuration: service_conf,
     install: true,
     install_dir: systemd_systemduserunitdir,
@@ -386,14 +386,14 @@ if enable_admin
 
   policy_in = configure_file(
     input: policy + '.in.in',
-    output: '@BASENAME@',
+    output: policy + '.in',
     configuration: service_conf,
   )
 
   i18n.merge_file(
     policy,
     input: policy_in,
-    output: '@BASENAME@',
+    output: policy,
     po_dir: po_dir,
     install: true,
     install_dir: gvfs_datadir / 'polkit-1/actions',
@@ -599,9 +599,11 @@ foreach program: programs
 endforeach
 
 foreach mount: mounts
+  name = mount + '.mount'
+
   configure_file(
-    input: mount + '.mount.in',
-    output: '@BASENAME@',
+    input: name + '.in',
+    output: name,
     configuration: service_conf,
     install: true,
     install_dir: gvfs_mountdir,
diff --git a/metadata/meson.build b/metadata/meson.build
index bbfd09fd..20ef5e03 100644
--- a/metadata/meson.build
+++ b/metadata/meson.build
@@ -7,7 +7,7 @@ if install_systemd_systemduserunitdir
 
   configure_file(
     input: service + '.in',
-    output: '@BASENAME@',
+    output: service,
     configuration: service_conf,
     install: true,
     install_dir: systemd_systemduserunitdir,
diff --git a/monitor/meson.build b/monitor/meson.build
index 50364210..eaf4ac0b 100644
--- a/monitor/meson.build
+++ b/monitor/meson.build
@@ -36,7 +36,7 @@ foreach monitor: monitors
 
     configure_file(
       input: monitor_name / service + '.in',
-      output: '@BASENAME@',
+      output: service,
       configuration: service_conf,
       install: true,
       install_dir: systemd_systemduserunitdir,
diff --git a/test/meson.build b/test/meson.build
index bc53a4f4..d91a65e3 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -5,9 +5,11 @@ if enable_installed_tests
   tests_conf = configuration_data()
   tests_conf.set('testdir', installed_tests_execdir)
 
+  session = 'session.conf'
+
   configure_file(
-    input: 'session.conf.in',
-    output: '@BASENAME@',
+    input: session + '.in',
+    output: session,
     configuration: tests_conf,
     install: true,
     install_dir: installed_tests_execdir,
@@ -17,7 +19,7 @@ if enable_installed_tests
 
   configure_file(
     input: all_tests + '.in',
-    output: '@BASENAME@.test',
+    output: all_tests + '.test',
     configuration: tests_conf,
     install: true,
     install_dir: installed_tests_metadir,