diff options
author | Dirkjan Ochtman <djc@apache.org> | 2013-10-02 15:20:13 +0200 |
---|---|---|
committer | Dirkjan Ochtman <djc@apache.org> | 2013-10-02 16:47:58 +0200 |
commit | 82a103ba71e8ccc9efb24d97b763517978e63c22 (patch) | |
tree | 862d1c97115203f2ce223ce25405d7935f9d0a7c | |
parent | 54813a7c19222556c588233f61d8e596d8756967 (diff) | |
download | couchdb-82a103ba71e8ccc9efb24d97b763517978e63c22.tar.gz |
Revert to checking both files, but give .in priority.
-rw-r--r-- | share/doc/src/conf.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/share/doc/src/conf.py b/share/doc/src/conf.py index 0b164022b..0c649b89b 100644 --- a/share/doc/src/conf.py +++ b/share/doc/src/conf.py @@ -22,9 +22,12 @@ extensions = ["sphinx.ext.todo", "sphinx.ext.extlinks", 'github', _info = {} _regex = re.compile('m4_define\(\[(.+)\],\s+\[(.+)\]\)') +_acinclude_m4 = '../../../acinclude.m4' _acinclude_m4_in = '../../../acinclude.m4.in' if os.path.exists(_acinclude_m4_in): _source = _acinclude_m4_in +elif os.path.exists(_acinclude_m4): + _source = _acinclude_m4 else: _source = None if _source is not None: @@ -142,4 +145,4 @@ html_context['git_branch'] = github_branch = 'master' github_docs_path = 'share/doc/src' -del _info, _regex, _acinclude_m4_in, _source +del _info, _regex, _acinclude_m4, _acinclude_m4_in, _source |