From eb79a1b17d00bb5ffd9e4ae215660bc0ac7b4092 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 30 May 2013 08:46:45 +0000 Subject: [PATCH] Use the variable --- debian/rules | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/debian/rules b/debian/rules index 8b2efb1e..df6304e8 100755 --- a/debian/rules +++ b/debian/rules @@ -183,13 +183,13 @@ override_dh_auto_install: echo "$$f"|grep "3\.2" || mv $$f `echo $$f|sed "s|\.1|-$(LLVM_VERSION).1|"`; \ done - mv $(CURDIR)/build-llvm/tools/clang/docs/tools/clang.1 $(CURDIR)/build-llvm/tools/clang/docs/tools/clang-$(LLVM_VERSION).1 + mv $(CURDIR)/$(TARGET_BUILD)/tools/clang/docs/tools/clang.1 $(CURDIR)/$(TARGET_BUILD)/tools/clang/docs/tools/clang-$(LLVM_VERSION).1 # Remove some license files rm $(CURDIR)/debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/include/llvm/Support/LICENSE.TXT # Managed in lldb-X.Y.links.in - rm -f $(CURDIR)/build-llvm/Release/lib/python*/site-packages/lldb/_lldb.so + rm -f $(CURDIR)/$(TARGET_BUILD)/Release/lib/python*/site-packages/lldb/_lldb.so # Remove the copy of jquery. See bug #701087 cd $(CURDIR)/docs/_build/html/_static/ && rm -f jquery.js && ln -s /usr/share/javascript/jquery/jquery.js @@ -221,22 +221,22 @@ override_dh_auto_test: # LLVM tests $(MAKE) -C $(TARGET_BUILD) check || true # clang tests - cd build-llvm/ && $(MAKE) -C tools/clang/ test || true + cd $(TARGET_BUILD)/ && $(MAKE) -C tools/clang/ test || true # lldb tests - cd build-llvm/Release/lib/python2.7/site-packages/lldb && if test ! -h _lldb.so -o ! -f _lldb.so; then ln -s ../../../liblldb.so _lldb.so; fi - cd build-llvm/Release/lib/python2.7/site-packages/lldb && if test ! -h libLLVM-$(LLVM_VERSION).so.$(SONAME_EXT) -o ! -f _lldb.so; then ln -s ../../../libLLVM-$(LLVM_VERSION).so libLLVM-$(LLVM_VERSION).so.$(SONAME_EXT); fi - cd build-llvm/ && $(MAKE) -C tools/lldb/test || true + cd $(TARGET_BUILD)/Release/lib/python2.7/site-packages/lldb && if test ! -h _lldb.so -o ! -f _lldb.so; then ln -s ../../../liblldb.so _lldb.so; fi + cd $(TARGET_BUILD)/Release/lib/python2.7/site-packages/lldb && if test ! -h libLLVM-$(LLVM_VERSION).so.$(SONAME_EXT) -o ! -f _lldb.so; then ln -s ../../../libLLVM-$(LLVM_VERSION).so libLLVM-$(LLVM_VERSION).so.$(SONAME_EXT); fi + cd $(TARGET_BUILD)/ && $(MAKE) -C tools/lldb/test || true # Managed by debian build system - rm -f $(CURDIR)/build-llvm/Release/lib/python*/site-packages/lldb/_lldb.so + rm -f $(CURDIR)/$(TARGET_BUILD)/Release/lib/python*/site-packages/lldb/_lldb.so # polly tests - cd build-llvm/ && $(MAKE) check-polly -C tools/polly/test/ || true + cd $(TARGET_BUILD)/ && $(MAKE) -C tools/polly/test/ check-polly || true if test "$(CODECOVERAGE)" = "yes"; then \ REPORT=reports/llvm-toolchain.info; \ mkdir -p reports/; \ - lcov --directory build-llvm/ --capture --ignore-errors source --output-file $$REPORT; \ + lcov --directory $(TARGET_BUILD)/ --capture --ignore-errors source --output-file $$REPORT; \ lcov --remove $$REPORT "/usr*" -o $$REPORT; \ - lcov --remove $$REPORT "build-llvm/*" -o $$REPORT; \ + lcov --remove $$REPORT "$(TARGET_BUILD)/*" -o $$REPORT; \ genhtml -o reports/coverage --show-details --highlight --legend $$REPORT; \ fi