Source: swi-prolog
Version: 8.0.0+dfsg-3
Severity: minor
Tags: patch
Hi,
the current rules overrides dh_auto_configure, dh_auto_build, and
dh_auto_clean:
- dh_auto_configure just invokes cmake
- dh_auto_build just calls make
- dh_auto_clean just removes the build directory
What all of them do is already done by the standard cmake build system
of debhelper, so:
- specify the wanted build directory for dh, and dh_auto_configure
- pass only the additional cmake flags to dh_auto_configure, relying
on the standard flags (removing CMAKE_INSTALL_PREFIX, which is already
set)
- do not specify cmake+ninja as buildsystem for debhelper: debhelper
already detects cmake, and ninja is not a build dependency (and thus
trying to use it will fail)
Thanks,
--
Pino
--- a/debian/rules
+++ b/debian/rules
@@ -10,7 +10,6 @@ JNIDIR := /usr/lib/$(DEB_BUILD_MULTI
CMAKE_OPTIONS = \
-DSWIPL_PACKAGES_QT=OFF \
- -DCMAKE_INSTALL_PREFIX=/usr \
-DSWIPL_INSTALL_DIR=$(PLBASENAME) \
-DSWIPL_INSTALL_IN_LIB=ON \
-DJAVA_COMPATIBILITY=ON \
@@ -63,16 +62,10 @@ define install_components
endef
%:
- dh $@ --buildsystem=cmake+ninja
+ dh $@ --builddirectory=build
override_dh_auto_configure:
- mkdir build && cd build && cmake $(CMAKE_OPTIONS) ..
-
-override_dh_auto_build:
- cd build && $(MAKE) < /dev/null
-
-override_dh_auto_clean:
- rm -rf build
+ dh_auto_configure --builddirectory=build -- $(CMAKE_OPTIONS)
override_dh_auto_install:
$(call install_components,$(NOX_COMPONENTS),swi-prolog-nox)
@@ -108,5 +101,5 @@ export USE_PUBLIC_NETWORK_TESTS
override_dh_auto_test:
-cd build && ctest -V -E jpl:
-.PHONY: override_dh_auto_configure override_dh_auto_build
override_dh_auto_clean override_dh_auto_install
+.PHONY: override_dh_auto_configure override_dh_auto_install
.PHONY: override_dh_install override_dh_auto_test
