aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Gnatenko <i.gnatenko.brain@gmail.com>2015-08-02 01:10:27 +0300
committerIgor Gnatenko <i.gnatenko.brain@gmail.com>2015-08-02 01:21:13 +0300
commitc1dddce4e7ef3dee6404045ecca8aea03672f46e (patch)
tree81e7a739f38110f70f935a56145945f7de421bc2
parent0728484ef77a8bcec542384abc0c7a82544e77ab (diff)
downloadmeson-c1dddce4e7ef3dee6404045ecca8aea03672f46e.zip
meson-c1dddce4e7ef3dee6404045ecca8aea03672f46e.tar.gz
meson-c1dddce4e7ef3dee6404045ecca8aea03672f46e.tar.bz2
macros.meson: simplify RPM macros by using expand
Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
-rw-r--r--data/macros.meson17
1 files 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 \
+}