kkofler pushed to git-cola (f20). "Set the makefile variables correctly. (..more)"

[notifications at fedoraproject.org]

>From 766b7a59cf2a560d264c143c4bcb639b85a09f74 Mon Sep 17 00:00:00 2001
From: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date: Mon, 15 Dec 2014 04:08:06 +0100
Subject: Set the makefile variables correctly.

Pass PYTHON directly to make instead of exporting it, also pass
SPHINXBUILD to make doc for Python 3 builds.

diff --git a/git-cola.spec b/git-cola.spec
index 2a020b0..506306a 100644
--- a/git-cola.spec
+++ b/git-cola.spec
@@ -18,8 +18,9 @@ BuildRequires:  xmlto
 BuildRequires:  python3-PyQt4-devel
 BuildRequires:  python3-devel
 BuildRequires:  python3-sphinx
+%global sphinxbuild sphinx-build-3
 # Set the Python version for brp-python-bytecompile (see the Python guidelines).
-# We also use this to set the PYTHON environment variable for the makefile.
+# We also use this to set the PYTHON makefile variable.
 %global __python %{__python3}
 Requires:       python3-PyQt4
 Requires:       python3-inotify
@@ -29,7 +30,7 @@ BuildRequires:  PyQt4-devel
 BuildRequires:  python2-devel
 BuildRequires:  python-sphinx
 # Set the Python version for brp-python-bytecompile (see the Python guidelines).
-# We also use this to set the PYTHON environment variable for the makefile.
+# We also use this to set the PYTHON makefile variable.
 %global __python %{__python2}
 Requires:       PyQt4
 Requires:       python-inotify
@@ -49,9 +50,8 @@ find . -type f -exec sh -c "head {} -n 1 | grep ^#\!\ \*/usr/bin/env\ python >/d
 %endif
 
 %build
-export PYTHON="%{__python}"
-make %{?_smp_mflags}
-make doc
+make %{?_smp_mflags} PYTHON="%{__python}"
+make doc PYTHON="%{__python}" %{?sphinxbuild:SPHINXBUILD="%{sphinxbuild}"}
 
 %install
 make DESTDIR=%{buildroot} prefix=%{_prefix} install
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/git-cola.git/commit/?h=f20&id=766b7a59cf2a560d264c143c4bcb639b85a09f74