diff --git a/_service b/_service
index be09d25..4b34b84 100644
--- a/_service
+++ b/_service
@@ -6,7 +6,7 @@
     <param name="exclude">.git</param>
     <param name="filename">suse-hpc</param>
     <param name="versionformat">0.5.%cd.%h</param>
-    <param name="revision">87c7989e7349d543ba33aada425716f6ffcba0fb</param>
+    <param name="revision">36e049da8d5c8bab1e78e15d7a26c91b58b12ff5</param>
 	<param name="extract">general/dlinfo.c</param>
 	<param name="extract">general/macros.hpc</param>
 	<param name="extract">general/hpc_elf.pl</param>
diff --git a/macros.hpc b/macros.hpc
index 5859c4b..c82393d 100644
--- a/macros.hpc
+++ b/macros.hpc
@@ -741,15 +741,11 @@ sys.exit(0)" %{1}
     %define _infodir %{hpc_infodir} \
     %define _libdir %{hpc_libdir} \
     %define _libexecdir %{hpc_libexecdir} \
-    %if x%{?hpc_localstatedir} != x%{_localstatedir} \
-    %define _localstatedir %{hpc_localstatedir} \
-    %endif \
+    %global _localstatedir %{hpc_localstatedir} \
     %define _mandir %{hpc_mandir} \
     %define _prefix %{hpc_prefix} \
     %define _sbindir %{hpc_sbindir} \
-    %if x%{?hpc_sharedstatedir} != x%{_sharedstatedir} \
-    %define _sharedstatedir %{hpc_sharedstatedir} \
-    %endif \
+    %global _sharedstatedir %{hpc_sharedstatedir} \
 #Do NOT define _sysconfig to %%hpc_sysconfig here!
     %cmake \\\
     %undefine __cmake \\\
@@ -759,15 +755,11 @@ sys.exit(0)" %{1}
     %undefine _infodir \\\
     %undefine _libdir \\\
     %undefine _libexecdir \\\
-    %if x%{?hpc_localstatedir} != x%{_localstatedir} \\\
     %undefine _localstatedir \\\
-    %endif \\\
     %undefine _mandir \\\
     %undefine _prefix \\\
     %undefine _sbindir \\\
-    %if x%{?hpc_sharedstatedir} != x%{_sharedstatedir} \\\
     %undefine _sharedstatedir \\\
-    %endif \\\
  }
 
 # wraps macro from macros.meson - paths replaced by HPC paths.
@@ -781,15 +773,11 @@ sys.exit(0)" %{1}
     %define _infodir %{hpc_infodir} \
     %define _libdir %{hpc_libdir} \
     %define _libexecdir %{hpc_libexecdir} \
-    %if x%{?hpc_localstatedir} != x%{_localstatedir} \
-    %define _localstatedir %{hpc_localstatedir} \
-    %endif \
+    %global _localstatedir %{hpc_localstatedir} \
     %define _mandir %{hpc_mandir} \
     %define _prefix %{hpc_prefix} \
     %define _sbindir %{hpc_sbindir} \
-    %if x%{?hpc_sharedstatedir} != x%{_sharedstatedir} \
-    %define _sharedstatedir %{hpc_sharedstatedir} \
-    %endif \
+    %global _sharedstatedir %{hpc_sharedstatedir} \
     %define _sysconfdir %{hpc_sysconfdir} \
     %meson \\\
     %undefine __meson \\\
@@ -799,14 +787,10 @@ sys.exit(0)" %{1}
     %undefine _infodir \\\
     %undefine _libdir \\\
     %undefine _libexecdir \\\
-    %if x%{?hpc_localstatedir} != x%{_localstatedir} \\\
     %undefine _localstatedir \\\
-    %endif \\\
     %undefine _mandir \\\
     %undefine _prefix \\\
     %undefine _sbindir \\\
-    %if x%{?hpc_sharedstatedir} != x%{_sharedstatedir} \\\
     %undefine _sharedstatedir \\\
-    %endif \\\
     %undefine _sysconfdir \\\
  }
diff --git a/suse-hpc.changes b/suse-hpc.changes
index 021df92..3d7980b 100644
--- a/suse-hpc.changes
+++ b/suse-hpc.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Thu Oct 26 21:07:33 UTC 2023 - Egbert Eich <eich@suse.com>
+
+- Previous fix did not work, revert and use %global instead of
+  %define.
+  The %hpc_cmake and %hpc_ninja macros wrap the %cmake and %ninja macros.
+  The wrapper needs to set all standard variables passed to cmake in these
+  macros to the hpc values.
+  With the mentioned macros this leads to an infinite recursion if using
+  %define. So we use %global instead.
+
 -------------------------------------------------------------------
 Tue Oct 24 09:09:47 UTC 2023 - Egbert Eich <eich@suse.com>
 
diff --git a/suse-hpc.spec b/suse-hpc.spec
index 51f737b..3a5e27c 100644
--- a/suse-hpc.spec
+++ b/suse-hpc.spec
@@ -20,7 +20,7 @@ Summary:        SUSE HPC Environment
 License:        BSD-3-Clause
 Group:          Productivity/Clustering/Computing
 Name:           suse-hpc
-Version:        0.5.20231024.0226cb7
+Version:        0.5.20231026.36e049d
 Release:        0
 Source0:        macros.hpc
 Source1:        dlinfo.c