From b358fbe27f1a1c10da84ca8ec05ccaf46c0237a6 Mon Sep 17 00:00:00 2001
From: Håkon Hallingstad <hakon@verizonmedia.com>
Date: Fri, 29 Mar 2019 13:50:02 +0100
Subject: Support building RPM when "make install" has already been executed

---
 dist/vespa.spec | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'dist/vespa.spec')

diff --git a/dist/vespa.spec b/dist/vespa.spec
index c902809f60a..4a64e10feca 100644
--- a/dist/vespa.spec
+++ b/dist/vespa.spec
@@ -166,6 +166,7 @@ Vespa - The open big data serving engine
 %setup -q
 
 %build
+%if ! 0%{?installdir:1}
 %if 0%{?_devtoolset_enable:1}
 source %{_devtoolset_enable} || true
 %endif
@@ -189,10 +190,16 @@ cmake3 -DCMAKE_INSTALL_PREFIX=%{_prefix} \
        .
 
 make %{_smp_mflags}
+%endif
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
+
+%if 0%{?installdir:1}
+cp -r %{installdir} %{buildroot}
+%else
 make install DESTDIR=%{buildroot}
+%endif
 
 mkdir -p %{buildroot}/usr/lib/systemd/system
 cp %{buildroot}/%{_prefix}/etc/systemd/system/vespa.service %{buildroot}/usr/lib/systemd/system
-- 
cgit v1.2.3