diff options
| -rw-r--r-- | doc/Makefile.local | 11 | ||||
| -rw-r--r-- | doc/mkdocdeps.py | 2 | ||||
| -rw-r--r-- | test/test-lib-common.sh | 4 |
3 files changed, 10 insertions, 7 deletions
diff --git a/doc/Makefile.local b/doc/Makefile.local index 23f40952..fab6d48e 100644 --- a/doc/Makefile.local +++ b/doc/Makefile.local @@ -40,7 +40,10 @@ ${MAN_ROFF_FILES}: ${dir}/man.stamp $(dir)/man.stamp: ${MAN_RST_FILES} ifeq ($(HAVE_SPHINX),1) $(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(DOCBUILDDIR)/man - touch $@ + for section in 1 5 7; do \ + mkdir -p $(DOCBUILDDIR)/man/man$${section}; \ + mv $(DOCBUILDDIR)/man/*.$${section} $(DOCBUILDDIR)/man/man$${section}; \ + done else ifeq ($(HAVE_RST2MAN),1) $(prerst2man) $(DOCBUILDDIR)/.. $(DOCBUILDDIR)/man touch $@ @@ -52,9 +55,9 @@ install-man: ${MAN_GZIP_FILES} mkdir -p "$(DESTDIR)$(mandir)/man1" mkdir -p "$(DESTDIR)$(mandir)/man5" mkdir -p "$(DESTDIR)$(mandir)/man7" - install -m0644 $(DOCBUILDDIR)/man/*.1.gz $(DESTDIR)/$(mandir)/man1 - install -m0644 $(DOCBUILDDIR)/man/*.5.gz $(DESTDIR)/$(mandir)/man5 - install -m0644 $(DOCBUILDDIR)/man/*.7.gz $(DESTDIR)/$(mandir)/man7 + install -m0644 $(DOCBUILDDIR)/man/man1/*.1.gz $(DESTDIR)/$(mandir)/man1 + install -m0644 $(DOCBUILDDIR)/man/man5/*.5.gz $(DESTDIR)/$(mandir)/man5 + install -m0644 $(DOCBUILDDIR)/man/man7/*.7.gz $(DESTDIR)/$(mandir)/man7 cd $(DESTDIR)/$(mandir)/man1 && ln -sf notmuch.1.gz notmuch-setup.1.gz $(dir)/docdeps.mk: $(dir)/conf.py $(dir)/mkdocdeps.py diff --git a/doc/mkdocdeps.py b/doc/mkdocdeps.py index e61bea60..3effdd85 100644 --- a/doc/mkdocdeps.py +++ b/doc/mkdocdeps.py @@ -10,7 +10,7 @@ rst_files = [] out=open(outfile,'w') for page in man_pages: rst_files = rst_files + ["doc/{0:s}.rst".format(page[0])] - roff_files = roff_files + ["{0:s}/man/{1:s}.{2:d}".format(builddir,page[1],page[4])] + roff_files = roff_files + ["{0:s}/man/{1:s}.{2:d}".format(builddir,page[0],page[4])] out.write ('MAN_ROFF_FILES := ' + ' \\\n\t'.join(roff_files)+'\n') out.write ('MAN_RST_FILES := ' + ' \\\n\t'.join(rst_files)+'\n') diff --git a/test/test-lib-common.sh b/test/test-lib-common.sh index e1eaa5a0..892991e2 100644 --- a/test/test-lib-common.sh +++ b/test/test-lib-common.sh @@ -98,12 +98,12 @@ then PATH=$GIT_VALGRIND/bin:$PATH GIT_EXEC_PATH=$GIT_VALGRIND/bin export GIT_VALGRIND - test -n "$notmuch_path" && MANPATH="$notmuch_path/man:$MANPATH" + test -n "$notmuch_path" && MANPATH="$notmuch_path/doc/_build/man" else # normal case if test -n "$notmuch_path" then PATH="$notmuch_path:$PATH" - MANPATH="$notmuch_path/man:$MANPATH" + MANPATH="$notmuch_path/doc/_build/man" fi fi export PATH MANPATH |