summaryrefslogtreecommitdiffstats
path: root/ubuntu
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2019-06-29 10:53:05 +0200
committerSlávek Banko <slavek.banko@axis.cz>2019-06-29 10:53:29 +0200
commit8bb18621b7b62ef46fda3b24483e28baaaf9d1eb (patch)
treece95c71ea54737fb00e01b7c9015e1d1a9625262 /ubuntu
parentc51c82ef736e35446525d35f70b8d7cd5b380361 (diff)
downloadtde-packaging-8bb18621b7b62ef46fda3b24483e28baaaf9d1eb.tar.gz
tde-packaging-8bb18621b7b62ef46fda3b24483e28baaaf9d1eb.zip
DEB tdeedu: Require kalzium/solver only if ocamlopt is available.
In the previous commit ocamldep was wrong - it was supposed to be ocamlopt. Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit f2fcec0e0ad7cb99ae59fd0cd7af18ec66c99bec)
Diffstat (limited to 'ubuntu')
-rwxr-xr-xubuntu/_base/tdeedu/debian/rules8
1 files changed, 4 insertions, 4 deletions
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