From 340e1bd03dd74e7d6079f48369060182812d3389 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 20 Dec 2017 09:20:11 -0500 Subject: [PATCH] Remove second make invocation for doc build/install In c3202fd ("Use prebuilt documentation on EL-5, where asciidoc is too old", 2013-01-04) the make targets to build and install the documentation were split into separate make calls to handle prebuilt docs on EL-5 where asciidoc was too old to build the documentation. Support for EL-5 was removed in 903d8f3 ("Remove EL-5 and old Fedora conditionals", 2017-07-22), making the separate make calls unneeded. --- git.spec | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/git.spec b/git.spec index c1a41a7..a46a4ac 100644 --- a/git.spec +++ b/git.spec @@ -438,10 +438,7 @@ chmod +x %{__perl_requires} %endif %build -make %{?_smp_mflags} all -%if ! 0%{?_without_docs} -make %{?_smp_mflags} doc -%endif +make %{?_smp_mflags} all %{!?_without_docs:doc} make -C contrib/emacs @@ -466,10 +463,7 @@ sed -i -e '1s|#! */usr/bin/env python$|#!%{__python2}|' \ %install rm -rf %{buildroot} -make %{?_smp_mflags} INSTALLDIRS=vendor install -%if ! 0%{?_without_docs} -make %{?_smp_mflags} INSTALLDIRS=vendor install-doc -%endif +make %{?_smp_mflags} INSTALLDIRS=vendor install %{!?_without_docs:install-doc} %global elispdir %{_emacs_sitelispdir}/git make -C contrib/emacs install \ @@ -492,8 +486,7 @@ install -pm 755 contrib/credential/libsecret/git-credential-libsecret \ install -pm 755 contrib/credential/netrc/git-credential-netrc \ %{buildroot}%{gitexecdir} -make -C contrib/subtree install -make -C contrib/subtree install-doc +make -C contrib/subtree install %{!?_without_docs:install-doc} mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d install -pm 0644 %{SOURCE12} %{buildroot}%{_sysconfdir}/httpd/conf.d/git.conf @@ -803,6 +796,7 @@ rm -rf %{buildroot} * Thu Nov 30 2017 Todd Zullinger - 2.15.1-3 - Include verbose logs in build output for 'make test' failures - Use %%autosetup macro to unpack and patch source +- Remove second make invocation for doc build/install * Wed Nov 29 2017 Todd Zullinger - 2.15.1-2 - Fix debuginfo for gnome-keyring and libsecret credential helpers