From 65fb2295cbb0aa4eb01c39faba598ebbf1aef82c Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 8 Aug 2016 09:16:54 +0000 Subject: [PATCH] merge recent changes --- debian/libclang1-X.Y.install.in | 2 +- debian/rules | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/debian/libclang1-X.Y.install.in b/debian/libclang1-X.Y.install.in index 48a548a5..d44e84f6 100644 --- a/debian/libclang1-X.Y.install.in +++ b/debian/libclang1-X.Y.install.in @@ -1,2 +1,2 @@ usr/lib/llvm-@LLVM_VERSION@/lib/libclang-@LLVM_VERSION@.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/ - +usr/lib/llvm-@LLVM_VERSION@/lib/libclang.so.1 diff --git a/debian/rules b/debian/rules index 83a58dd1..a0da74e6 100755 --- a/debian/rules +++ b/debian/rules @@ -252,11 +252,12 @@ build_doc: echo "$$f"|grep $(LLVM_VERSION) || mv $$f `echo $$f|sed "s|\.1|-$(LLVM_VERSION).1|"`; \ done; \ 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 # 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/ $(TARGET_BUILD)/tools/polly/docs/html/_static/; do \ + 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 \ cd $$d && rm -f jquery.js && ln -s /usr/share/javascript/jquery/jquery.js && cd -; \ cd $$d && rm -f underscore.js && ln -s /usr/share/javascript/underscore/underscore.js && cd -; \ done