| f2fcec0e | 2019-06-29 08:53:05 | Slávek Banko |
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@...> |
||
|
M debian/_base/tdeedu/debian/rules M ubuntu/_base/tdeedu/debian/rules |
||
debian/_base/tdeedu/debian/rulesdiff --git a/debian/_base/tdeedu/debian/rules b/debian/_base/tdeedu/debian/rules index 366ff20..0070b75 100755 --- a/debian/_base/tdeedu/debian/rules +++ b/debian/_base/tdeedu/debian/rules @@ -17,10 +17,10 @@ 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 @@ -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 ubuntu/_base/tdeedu/debian/rulesdiff --git a/ubuntu/_base/tdeedu/debian/rules b/ubuntu/_base/tdeedu/debian/rules index 366ff20..0070b75 100755 --- a/ubuntu/_base/tdeedu/debian/rules +++ b/ubuntu/_base/tdeedu/debian/rules @@ -17,10 +17,10 @@ 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 @@ -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 |
||