From: Ben Kaduk Date: Thu, 29 Nov 2012 00:06:44 +0000 (-0500) Subject: Note notice.txt's dependency on version.py X-Git-Tag: krb5-1.12-alpha1~433 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9031b739fc4f9e4215e537855a853d2134a69ba9;p=thirdparty%2Fkrb5.git Note notice.txt's dependency on version.py This dependency has been in effect since the notice build was changed to use the main conf.py, due to its unconditional execfile('version.py'). Adding another conditional in conf.py seems to add needless complication, it is easier to just note the dependency in the Makefile and carry on. ticket: 7470 (new) title: NOTICE build has unnoted dependency on version.py tags: pullup target_version: 1.11 --- diff --git a/src/doc/Makefile.in b/src/doc/Makefile.in index 56ec0bba3a..69ea475ed2 100644 --- a/src/doc/Makefile.in +++ b/src/doc/Makefile.in @@ -52,7 +52,7 @@ substhtml: composite paths.py $(SPHINX_BUILD) -t pathsubs -q rst_composite html_subst # Create an ASCII (okay, UTF-8) version of the NOTICE file -notice.txt: $(docsrc)/conf.py $(docsrc)/notice.rst +notice.txt: $(docsrc)/conf.py $(docsrc)/notice.rst $(docsrc)/version.py $(SPHINX_BUILD) -b text -t notice -q $(docsrc) . NOTICE: notice.txt