From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Thu, 13 Apr 2017 00:05:33 +0000 (-0400)
Subject: meson: support (the removal of) lines with ##
X-Git-Tag: v234~286^2~48
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aa13df58741de826cf298825f66d6a7036884fc1;p=thirdparty%2Fsystemd.git

meson: support (the removal of) lines with ##
---

diff --git a/units/meson.build b/units/meson.build
index b051c5d3cc8..62f1e33dbf3 100644
--- a/units/meson.build
+++ b/units/meson.build
@@ -225,19 +225,23 @@ foreach tuple : in_units
   install = ((conds.get(0, '') == '' or conf.get(conds[0], 0) == 1) and
              (conds.get(1, '') == '' or conf.get(conds[1], 0) == 1))
 
-  gen = configure_file(
-      input : file + '.in',
-      output : file,
-      configuration : substs)
-  if install
-    install_data(gen,
-                 install_dir : systemunitdir)
+  gen1 = configure_file(
+    input : file + '.in',
+    output : file + '.tmp',
+    configuration : substs)
+  gen2 = custom_target(
+    file,
+    input : gen1,
+    output : file,
+    command : [sed, '/^## /d', '@INPUT@'],
+    capture : true,
+    install : install,
+    install_dir : systemunitdir)
 
-    if tuple.length() > 2
-      foreach target : tuple[2].split()
-        meson.add_install_script('meson-add-wants.sh', systemunitdir, target, file)
-      endforeach
-    endif
+  if install and tuple.length() > 2
+    foreach target : tuple[2].split()
+      meson.add_install_script('meson-add-wants.sh', systemunitdir, target, file)
+    endforeach
   endif
 endforeach