aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDario Lombardo <lomato@gmail.com>2018-04-11 09:38:59 +0200
committerAnders Broman <a.broman58@gmail.com>2018-04-11 21:38:15 +0000
commit5f20746a29643f292e6a18c47959fef3e52dfea9 (patch)
tree5a1d7a3106886dadb260e3a68c6b1285266d7f41
parent98826de8e5ae62ea5b37c92a3e1097d6c7e73897 (diff)
RPM: set ninja executable in %install target.
It is not inherited by previous target. Change-Id: I11be59211a900375e02fce8c05cc4164b8dc42e4 Reviewed-on: https://code.wireshark.org/review/26877 Reviewed-by: Anders Broman <a.broman58@gmail.com>
-rw-r--r--packaging/rpm/wireshark.spec.in1
1 files changed, 1 insertions, 0 deletions
diff --git a/packaging/rpm/wireshark.spec.in b/packaging/rpm/wireshark.spec.in
index 7daa27b..5ed94d0 100644
--- a/packaging/rpm/wireshark.spec.in
+++ b/packaging/rpm/wireshark.spec.in
@@ -280,6 +280,7 @@ make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
%if %{with ninja}
+NINJA=$(which ninja || which ninja-build)
DESTDIR=$RPM_BUILD_ROOT $NINJA install
%if %{with guides}
DESTDIR=$RPM_BUILD_ROOT $NINJA install_guides