From 891ca09f94bdbf57e47a1ce4807dc3b1e9570fc9 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 21 Apr 2017 20:26:39 +0000 Subject: [PATCH] Tolerate if ocaml failed --- debian/changelog | 1 + debian/rules | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index b937ccc2..3a08546d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ llvm-toolchain-4.0 (1:4.0-5) unstable; urgency=medium * Prepare version 4.0.1 + * Tolerate if ocaml failed -- diff --git a/debian/rules b/debian/rules index ca62eb9e..373be3aa 100755 --- a/debian/rules +++ b/debian/rules @@ -279,9 +279,9 @@ override_dh_prep: build_doc build_doc: cd $(CURDIR)/docs && make -f Makefile.sphinx && make -f Makefile.sphinx man cd $(CURDIR)/clang/docs && make -f Makefile.sphinx && make -f Makefile.sphinx man - if test "$(OCAML_ENABLE)" = yes; then \ + -(if test "$(OCAML_ENABLE)" = yes; then \ $(PRE_PROCESS) $(MAKE) $(NJOBS) -C "$(TARGET_BUILD)/docs" ocaml_doc; \ - fi + fi) # Continue if failing, Ubuntu precise cannot generate manpages as sphinx is too old -(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) @@ -433,8 +433,9 @@ override_dh_auto_install: # Rename OCaml bindings if test "$(OCAML_ENABLE)" = yes; then \ + mkdir -p "$(DEB_INST)$(OCAML_STDLIB_DIR)"; \ + mkdir -p "$(DEB_INST)usr/lib/llvm-$(LLVM_VERSION)/share/doc/llvm/ocaml-html/"; \ if test -d "$(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/ocaml"; then \ - mkdir -p "$(DEB_INST)$(OCAML_STDLIB_DIR)"; \ mv -f "$(DEB_INST)usr/lib/llvm-$(LLVM_VERSION)/lib/ocaml" \ "$(DEB_INST)$(OCAML_STDLIB_DIR)/llvm-$(LLVM_VERSION)"; \ fi; \