Use the manpage from clang.rst instead of help2man

This commit is contained in:
Sylvestre Ledru 2016-08-27 12:58:58 +00:00
parent 25fa4b4134
commit a9ab44f72b
3 changed files with 12 additions and 8 deletions

1
debian/changelog vendored
View File

@ -1,6 +1,7 @@
llvm-toolchain-3.9 (1:3.9~+rc3-1~exp2) experimental; urgency=medium
* Fix the renaming of the manpages (Closes: #834077)
* Use the manpage from clang.rst instead of help2man
* Fix a crash with clang-tidy (Closes: #833802)
Fixed in 1:3.9~+rc1-1~exp1

View File

@ -1,4 +1,5 @@
debian/man/clang-@LLVM_VERSION@.1
clang/docs/_build/man/clang-@LLVM_VERSION@.1
clang/tools/scan-build/man/scan-build-@LLVM_VERSION@.1
debian/man/clang-check-@LLVM_VERSION@.1
debian/man/clang-rename-@LLVM_VERSION@.1
debian/man/clang-query-@LLVM_VERSION@.1
@ -6,4 +7,4 @@ debian/man/clang-apply-replacements-@LLVM_VERSION@.1
debian/man/sancov-@LLVM_VERSION@.1
debian/man/scan-view-@LLVM_VERSION@.1
debian/man/modularize-@LLVM_VERSION@.1
clang/tools/scan-build/man/scan-build-@LLVM_VERSION@.1

14
debian/rules vendored
View File

@ -249,16 +249,18 @@ build_doc:
-(cd $(TARGET_BUILD) && make $(NJOBS) docs-llvm-html docs-clang-html docs-clang-tools-html docs-polly-html docs-polly-man docs-clang-tools-man docs-clang-man docs-llvm-man)
# Rename manpages
d=$(TARGET_BUILD)/docs/man/; \
d=$(CURDIR)/docs/_build/man/; \
if test -d $$d; then \
cd $$d; \
for f in *.1; do \
echo "$$f"|grep $(LLVM_VERSION) || mv $$f `echo $$f|sed "s|\.1|-$(LLVM_VERSION).1|"`; \
done; \
cd $$d; \
for f in *.1; do \
echo "$$f"|grep $(LLVM_VERSION) || mv $$f `echo $$f|sed "s|\.1|-$(LLVM_VERSION).1|"`; \
done; \
else \
echo "could not find $$d"; \
fi
# the clang doc generation only generates clang manpage
# When it will do more, we should move that in the loop above
# cd $(CURDIR)/clang/docs/_build/man/; mv clang.1 clang-$(LLVM_VERSION).1
cd $(CURDIR)/clang/docs/_build/man/; mv clang.1 clang-$(LLVM_VERSION).1
# Remove the copy of jquery. See bug #701087
for d in $(TARGET_BUILD)/docs/html/_static/ $(TARGET_BUILD)/tools/clang/docs/html/_static/ $(TARGET_BUILD)/tools/clang/tools/extra/docs/html/_static/; do \