From 4ce35159d8ead6022a8f8945b8b1d3659b0d5fd6 Mon Sep 17 00:00:00 2001
From: Arun Isaac
Date: Thu, 10 Jun 2021 15:13:24 +0530
Subject: pre-inst-env: Handle absent environment variables.

* pre-inst-env.in (prepend-path-env!): Handle case when environment
variable is absent and getenv returns #f.
---
 pre-inst-env.in | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pre-inst-env.in b/pre-inst-env.in
index 19aea8e..d0aa24c 100644
--- a/pre-inst-env.in
+++ b/pre-inst-env.in
@@ -22,8 +22,11 @@
 (import (ice-9 match))
 
 (define (prepend-path-env! name . values)
-  (setenv name (string-append (string-join values ":" 'suffix)
-                              (getenv name))))
+  (setenv name (string-join (append values
+                                    (if (getenv name)
+                                        (string-split (getenv name) #\:)
+                                        '()))
+                            ":")))
 
 (prepend-path-env! "GUILE_LOAD_PATH" "@abs_top_builddir@" "@abs_top_srcdir@")
 (prepend-path-env! "GUILE_LOAD_COMPILED_PATH" "@abs_top_builddir@")
-- 
cgit v1.2.3