meson: use jinja2 in src/timesync/

diff --git a/src/timesync/meson.build b/src/timesync/meson.build
index 30d2a0caee787dded1884061e75def33ad921b6d..ec80b16e8291e5fa1df52dfe1b9fc6571befb860 100644 (file)
--- a/src/timesync/meson.build
+++ b/src/timesync/meson.build
@@ -34,15 +34,16 @@ libtimesyncd_core = static_library(
         include_directories : includes,
         link_with : [timesyncd_link_with])
 
+custom_target(
+        'timesyncd.conf',
+        input : 'timesyncd.conf.in',
+        output : 'timesyncd.conf',
+        command : [meson_render_jinja2, config_h, '@INPUT@'],
+        capture : true,
+        install : conf.get('ENABLE_TIMESYNCD') == 1 and install_sysconfdir_samples,
+        install_dir : pkgsysconfdir)
+
 if conf.get('ENABLE_TIMESYNCD') == 1
-        timesyncd_conf = configure_file(
-                input : 'timesyncd.conf.in',
-                output : 'timesyncd.conf',
-                configuration : substs)
-        if install_sysconfdir_samples
-                install_data(timesyncd_conf,
-                             install_dir : pkgsysconfdir)
-        endif
         install_data('org.freedesktop.timesync1.conf',
                      install_dir : dbuspolicydir)
         install_data('org.freedesktop.timesync1.service',

diff --git a/src/timesync/timesyncd.conf.in b/src/timesync/timesyncd.conf.in
index 8a2c33e17cd4e876ecec3af0f50f06cc2d867301..d5f29e1598cb4ecba393b20d5645c7907d95ff57 100644 (file)
--- a/src/timesync/timesyncd.conf.in
+++ b/src/timesync/timesyncd.conf.in
@@ -14,7 +14,7 @@
 
 [Time]
 #NTP=
-#FallbackNTP=@NTP_SERVERS@
+#FallbackNTP={{NTP_SERVERS}}
 #RootDistanceMaxSec=5
 #PollIntervalMinSec=32
 #PollIntervalMaxSec=2048