feature/native-comp 1f626e9 2/2: * Remove `system-configuration' from eln filename

[Andrea Corallo]

branch: feature/native-comp
commit 1f626e9662d8120acd5a937f847123cc2b8c6e31
Author: Andrea Corallo <akrl@sdf.org>
Commit: Andrea Corallo <akrl@sdf.org>

    * Remove `system-configuration' from eln filename
    
        * src/comp.c (hash_native_abi): Remove `system-configuration'
        from eln filename. Add `system-configuration' and
        `emacs-version' into `comp-abi-hash'.
---
 src/comp.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/comp.c b/src/comp.c
index 1b346f8..289d89d 100644
--- a/src/comp.c
+++ b/src/comp.c
@@ -704,16 +704,12 @@ hash_native_abi (void)
 
   Vcomp_abi_hash =
     comp_hash_string (
-      concat2 (build_string (ABI_VERSION),
+      concat3 (build_string (ABI_VERSION),
+              concat2 (Vemacs_version, Vsystem_configuration),
               Fmapconcat (intern_c_string ("subr-name"),
                           Vcomp_subr_list, build_string (""))));
-  Lisp_Object separator = build_string ("-");
   Vcomp_native_version_dir =
-    concat3 (Vemacs_version,
-            separator,
-            concat3 (Vsystem_configuration,
-                     separator,
-                     Vcomp_abi_hash));
+    concat3 (Vemacs_version, build_string ("-"), Vcomp_abi_hash);
 }
 
 static void