From 581537b20b77ae78f50b179af934c5f526485222 Mon Sep 17 00:00:00 2001
From: Martin Vidner <martin@vidner.net>
Date: Mon, 23 Sep 2024 16:51:39 +0200
Subject: [PATCH] setup_env.sh: don't invoke cmake twice

Makefile.cvs would do it in build/ and then here in ./
Call it once, in build/
---
 rust/libzypp/setup_env.sh | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/rust/libzypp/setup_env.sh b/rust/libzypp/setup_env.sh
index e1be0da861..6d658f844a 100755
--- a/rust/libzypp/setup_env.sh
+++ b/rust/libzypp/setup_env.sh
@@ -74,12 +74,18 @@ git submodule init
 git submodule update --checkout
 
 # lets build libzypp
+(
 cd libzypp
-make -f Makefile.cvs
-cmake -D BUILD_GLIB_API=ON -D DISABLE_AUTODOCS=ON
+mkdir -p build
+cd build
+# With /usr/local, we have to set a path: LD_LIBRARY_PATH=/usr/local/lib64 zypprs
+# but the plus side is that the /usr zypper keeps working :)
+#
+# cmake -D CMAKE_INSTALL_PREFIX=/usr/local -D BUILD_GLIB_API=ON -D DISABLE_AUTODOCS=ON ..
+cmake -D BUILD_GLIB_API=ON -D DISABLE_AUTODOCS=ON ..
 make -j$(nproc)
 $SUDO make install
-cd -
+)
 
 # now lets make rust working
 rustup install stable