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>
pull/21/head
Slávek Banko 5 years ago
parent d2f604b56b
commit f2fcec0e0a
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668

@ -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

@ -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

Loading…
Cancel
Save