Install GGML backends in libexec

diff --git a/debian/libggml-blas.install b/debian/libggml-blas.install
index 130b7babd1d5b14b2c65014892417d103fbca739..985f7e75c2f561f4eff188dac5dfcb02c13aa8fa 100644 (file)
--- a/debian/libggml-blas.install
+++ b/debian/libggml-blas.install
@@ -1 +1 @@
-/usr/lib/*/libggml-blas.so
+/usr/libexec/*/ggml/libggml-blas.so

diff --git a/debian/libggml-cpu.install b/debian/libggml-cpu.install
index f2f99f4dad9b9019dd59307bed3c503722048e97..277c440917bcbe35891e6c507ac13271ded2d897 100644 (file)
--- a/debian/libggml-cpu.install
+++ b/debian/libggml-cpu.install
@@ -1 +1 @@
-/usr/lib/*/libggml-cpu*.so
+/usr/libexec/*/ggml/libggml-cpu*.so

diff --git a/debian/libggml-rpc.install b/debian/libggml-rpc.install
index 1a61a7a0983e9fc083019ddcc0de382f8b5bf41d..ad63249fe5416b91d4eb726faab6f7cae66cd932 100644 (file)
--- a/debian/libggml-rpc.install
+++ b/debian/libggml-rpc.install
@@ -1 +1 @@
-/usr/lib/*/libggml-rpc.so
+/usr/libexec/*/ggml/libggml-rpc.so

diff --git a/debian/libggml-vulkan.install b/debian/libggml-vulkan.install
index aef8ce081a32f00e11a96fe733dfe3a453caae4d..cbdccf662f80c1e51dd1b1441618a390ad2e6d99 100644 (file)
--- a/debian/libggml-vulkan.install
+++ b/debian/libggml-vulkan.install
@@ -1 +1 @@
-/usr/lib/*/libggml-vulkan.so
+/usr/libexec/*/ggml/libggml-vulkan.so

diff --git a/debian/rules b/debian/rules
index c6374e49e4dfedc585d60616bfaf64fe8bbb5949..d704a7c54e76b7fca4af63c44ee5c8bba7f72cef 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -10,6 +10,7 @@ include /usr/share/dpkg/architecture.mk
 
 build_multiarch=build/$(DEB_HOST_MULTIARCH)
 install_lib_multiarch=debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)
+install_libexec_multiarch=debian/tmp/usr/libexec/$(DEB_HOST_MULTIARCH)
 
 # parallelism
 DEB_BUILD_OPTIONS ?= parallel=8
@@ -54,12 +55,14 @@ override_dh_auto_configure:
 
 override_dh_auto_install:
        dh_auto_install
+       
        # Since no CMake install configuration is available for the libggml-* backend target:
        # - we set CMAKE_SKIP_BUILD_RPATH=ON during build
-       # - we install the backends explicitly in the dist tree
+       # - we install the backends explicitly in libexec so that executables can be installed with them
+       mkdir -p $(install_libexec_multiarch)/ggml
        for file in $(build_multiarch)/bin/libggml-*.so; do \
        patchelf --set-soname $$(basename "$$file") $$file; \
-               install -t $(install_lib_multiarch) $$file; \
+               install -t $(install_libexec_multiarch)/ggml $$file; \
        done
 
 override_dh_dwz: