From: Jan Rękorajski <baggins@pld-linux.org>
Date: Thu, 28 Nov 2013 13:37:52 +0000 (+0100)
Subject: - clean before make
X-Git-Tag: auto/th/apache-mod_python-3.5.0-3~2
X-Git-Url: https://git.pld-linux.org/?p=packages%2Fapache-mod_python.git;a=commitdiff_plain;h=8734879e192eb0587b59155a2356c61baaf52f8e;hp=52a20df308d76d5714a53d7f4625f8b1f639cc14;ds=sidebyside

- clean before make
- don't run make install in install, as we do this by copying preinstalled files
---

diff --git a/apache-mod_python.spec b/apache-mod_python.spec
index 10b5374..62ae558 100644
--- a/apache-mod_python.spec
+++ b/apache-mod_python.spec
@@ -233,21 +233,25 @@ prestandan jämfört med den traditionella CGI-metoden.
 %build
 %{__aclocal}
 %{__autoconf}
+
 %if %{with python2}
 %configure \
 	--with-apxs=%{apxs} \
 	--with-python=%{__python}
+
+%{__make} clean
 %{__make} dso
 install -d apache-mod_python{%{apachelibdir},%{apacheconfdir},%{_bindir}}
 %{__make} install \
 	DESTDIR=`pwd`/apache-mod_python
-%{__make} clean
 %endif
 
 %if %{with python3}
 %configure \
 	--with-apxs=%{apxs} \
 	--with-python=%{__python3}
+
+%{__make} clean
 %{__make} dso
 install -d apache-mod_python3{%{apachelibdir},%{apacheconfdir},%{_bindir}}
 %{__make} install \
@@ -260,9 +264,6 @@ install -d apache-mod_python3{%{apachelibdir},%{apacheconfdir},%{_bindir}}
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{apachelibdir},%{apacheconfdir},%{_bindir}}
 
-%{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT
-
 %if %{with python2}
 cp -a apache-mod_python/* $RPM_BUILD_ROOT
 install %{SOURCE1} $RPM_BUILD_ROOT%{apacheconfdir}/60_mod_python.conf