From f2fcec0e0ad7cb99ae59fd0cd7af18ec66c99bec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sat, 29 Jun 2019 10:53:05 +0200 Subject: DEB tdeedu: Require kalzium/solver only if ocamlopt is available. In the previous commit ocamldep was wrong - it was supposed to be ocamlopt. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- ubuntu/_base/tdeedu/debian/rules | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'ubuntu/_base/tdeedu/debian/rules') diff --git a/ubuntu/_base/tdeedu/debian/rules b/ubuntu/_base/tdeedu/debian/rules index 366ff2006..0070b7556 100755 --- a/ubuntu/_base/tdeedu/debian/rules +++ b/ubuntu/_base/tdeedu/debian/rules @@ -17,10 +17,10 @@ DEB_DH_MAKESHLIBS_ARGS_libkiten1-trinity := -V'libkiten1-trinity' PACKAGES_WITH_LIBS := libtdeedu3-trinity libkiten1-trinity kvoctrain-trinity # Although ocaml is available for all architectures, -# ocamldep for some architectures is not available. +# ocamlopt for some architectures is not available. # Therefore, kalzium/solver build will be required -# according to ocamldep availability. -HAVE_OCAMLDEP = $(if $(wildcard /usr/bin/ocamldep),ON,OFF) +# according to ocamlopt availability. +HAVE_OCAMLOPT= $(if $(wildcard /usr/bin/ocamlopt),ON,OFF) DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ @@ -32,7 +32,7 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_SKIP_RPATH="OFF" \ -DBUILD_ALL="ON" \ -DWITH_ALL_OPTIONS="ON" \ - -DWITH_OCAML_SOLVER="$(HAVE_OCAMLDEP)" + -DWITH_OCAML_SOLVER="$(HAVE_OCAMLOPT)" DEB_MAKE_CHECK_TARGET = check -- cgit v1.2.1