From c1dddce4e7ef3dee6404045ecca8aea03672f46e Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <i.gnatenko.brain@gmail.com>
Date: Sun, 2 Aug 2015 01:10:27 +0300
Subject: macros.meson: simplify RPM macros by using expand

Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
---
 data/macros.meson | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/data/macros.meson b/data/macros.meson
index 42ad949..1da409c 100644
--- a/data/macros.meson
+++ b/data/macros.meson
@@ -1,11 +1,12 @@
 %__meson /usr/bin/meson
 
-%meson \
-  CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
-  CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
-  FFLAGS="${FFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" ; export FFLAGS ; \
-  FCFLAGS="${FCFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" ; export FCFLAGS ; \
-  %{?__global_ldflags:LDFLAGS="${LDFLAGS:-%__global_ldflags}" ; export LDFLAGS ;} \
-  %__meson \\\
+%meson() %{expand:\
+  CFLAGS="%{optflags}" ; \
+  CXXFLAGS="%{optflags}" ; \
+  FFLAGS="%{optflags} -I%{_fmoddir}" ; \
+  FCFLAGS="%{optflags} -I%{_fmoddir}" ; \
+  LDFLAGS="%{__global_ldflags}" ; \
+  %__meson %{?1} \\\
         --prefix=%{_prefix} \\\
-        --buildtype=plain
+        --buildtype=plain \
+}
-- 
cgit v1.1