[packages/apache-mod_python] - clean before make - don't run make install in install, as we do this by copying preinstalled files

baggins baggins at pld-linux.org
Thu Nov 28 14:41:23 CET 2013


commit 8734879e192eb0587b59155a2356c61baaf52f8e
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Thu Nov 28 14:37:52 2013 +0100

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

 apache-mod_python.spec | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
---
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
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/apache-mod_python.git/commitdiff/08225cf832b549de055a8a93c46669c0e37e48c4



More information about the pld-cvs-commit mailing list