← Back to branch summary

~ubuntu-branches/debian/sid/ocaml/sid

« back to all changes in this revision

Viewing changes to debian/rules

  • Committer: Steve Langasek
  • Date: 2011-03-23 21:16:52 UTC
  • Revision ID: steve.langasek@linaro.org-20110323211652-rw2zo66wxozctu8n
http://bugs.debian.org/619344
debian/rules: fix build failure when libX11 is in a multiarch directory;
unlike other library checks, libX11 gets probed for directly rather than
asking the compiler.  Closes: #619344.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/rules
17
17
OCAML_OPT_ARCH := $(findstring $(DEB_BUILD_ARCH),$(OCAML_NATIVE_ARCHS))
18
18
OCAML_HAVE_OCAMLOPT := $(if $(OCAML_OPT_ARCH),yes,no)
19
19
OCAML_OCAMLDOC_DESTDIR_HTML =
 
20
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
20
21
 
21
22
# dh_ocamlinit cannot be used for ocaml itself
22
23
include debian/ocamlinit.mk
51
52
CONFIGURE_OPTS := \
52
53
  --with-pthread -prefix /usr \
53
54
  -libdir $(OCAML_STDLIB_DIR) \
 
55
  -x11lib /usr/lib/$(DEB_HOST_MULTIARCH) \
54
56
  -mandir /usr/share/man \
55
57
  -tkdefs "-I/usr/include/tcl8.5" \
56
58
  -tklibs "-L/usr/lib -ltk8.5 -ltcl8.5"