Extra subdirectory removed for accelerator subdir

Author: ocaisa

EESSI-extend-easybuild.eb

@@ -108,7 +108,7 @@ if (os.getenv("EESSI_CVMFS_INSTALL") ~= nil) then
   easybuild_installpath = os.getenv("EESSI_SOFTWARE_PATH")
   -- enforce accelerator subdirectory usage for CVMFS installs (only if an accelerator install is requested)
   if (eessi_accelerator_target ~= nil) and (cuda_compute_capability ~= nil) and (os.getenv("EESSI_ACCELERATOR_INSTALL") ~= nil) then
-      easybuild_installpath = pathJoin(easybuild_installpath, 'accel', eessi_accelerator_target)
+      easybuild_installpath = pathJoin(easybuild_installpath, eessi_accelerator_target)
   end
 elseif (os.getenv("EESSI_SITE_INSTALL") ~= nil) then
   -- Make sure no other EESSI install environment variables are set
@@ -118,7 +118,7 @@ elseif (os.getenv("EESSI_SITE_INSTALL") ~= nil) then
   easybuild_installpath = os.getenv("EESSI_SITE_SOFTWARE_PATH")
   -- enforce accelerator subdirectory usage for site installs (only if an accelerator install is requested)
   if (eessi_accelerator_target ~= nil) and (cuda_compute_capability ~= nil) and (os.getenv("EESSI_ACCELERATOR_INSTALL") ~= nil) then
-      easybuild_installpath = pathJoin(easybuild_installpath, 'accel', eessi_accelerator_target)
+      easybuild_installpath = pathJoin(easybuild_installpath, eessi_accelerator_target)
   end
 else
   -- Deal with user and project installs