Merge branch 'main' into olex2_1.5

olex2/build

@@ -1,6 +1,15 @@
 #!/usr/bin/env modbuild
 
 pbuild::configure(){
+    :
+}
+
+pbuild::compile(){
+    :
+}
+
+pbuild::install() {
+
     # Get the OS and architecture
     os=$(uname -s | tr '[:upper:]' '[:lower:]')
     arch=$(uname -m)
@@ -11,23 +20,24 @@ pbuild::configure(){
         armv7*)       arch="arm" ;;
     esac
 
-    ZIP="${SRC_DIR}/${P}-${os}${arch}.zip"
+    ZIP="${PREFIX}/${P}-${os}${arch}.zip"
 
     # Copy the zip archive from the build directory
     cp -n "${BUILDBLOCK_DIR}/${P}-${os}${arch}.zip" "$ZIP"
 
-    # Extract contents directly into SRC_DIR
-    unzip -o -q "$ZIP" -d "${SRC_DIR}"
+    # Extract contents directly into PREFIX
+    unzip -o -q "$ZIP" -d "${PREFIX}"
 
-    # Clean up the zip file
-    rm -f "$ZIP"
-}
+    # Create the bin directory
+    mkdir -p "${PREFIX}/bin"
 
-pbuild::compile(){
-    :
-}
-
-pbuild::install() {
+    # Copy the executable files to the bin directory
+    find "${PREFIX}/${P}" -maxdepth 1 -type f -perm -111 -exec mv {} "${PREFIX}/bin/" \;
+    
     # Move all contents of the zip archive into PREFIX
-    mv "${SRC_DIR}/${P}/"* "${PREFIX}/"
+    mv "${PREFIX}/${P}/"* "${PREFIX}/"
+    rmdir "${PREFIX}/${P}"
+
+    # Remove zip archive
+    rm "$ZIP"
 }

olex2/modulefile

@@ -16,6 +16,3 @@ workflow into a single, intuitive package.
 
 # Use software OpenGL explicitly to avoid Vulkan drivers missing error
 setenv LIBGL_ALWAYS_SOFTWARE 1
-
-# Because the executable files need to be in the top directory
-prepend-path    PATH    $PREFIX