From 4da2152f0e0b4bd9eaa5cc1a2ca420039613c059 Mon Sep 17 00:00:00 2001
From: Aron Simon <aron.simon@sigmatechnology.se>
Date: Thu, 21 Jun 2018 10:19:10 +0200
Subject: [PATCH] Fix PATH-type variables (no more space in concatenated
 strings)

Signed-off-by: Aron Simon <aron.simon@sigmatechnology.se>
---
 regression_test/Makefile.regression                           | 4 ++--
 regression_test/XML/XmlWorkflow/bin/prj2mk.pl                 | 4 ++--
 regression_test/XML/XmlWorkflow/bin2/prj2mk.pl                | 4 ++--
 regression_test/cfgFile/define/macro_reference/Makefile       | 4 ++--
 regression_test/cfgFile/define/structured/Makefile            | 4 ++--
 regression_test/cfgFile/module_parameters/assignment/Makefile | 4 ++--
 regression_test/cfgFile/module_parameters/concat/Makefile     | 4 ++--
 regression_test/cfgFile/module_parameters/nested/Makefile     | 4 ++--
 regression_test/cfgFile/module_parameters/references/Makefile | 4 ++--
 .../cfgFile/module_parameters/special_values/Makefile         | 4 ++--
 regression_test/cfgFile/ordered_include/Makefile              | 4 ++--
 regression_test/cfgFile/testport_parameters/Makefile          | 4 ++--
 regression_test/fuzzy/Makefile                                | 4 ++--
 regression_test/templateExclusiveRange/Makefile               | 4 ++--
 14 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/regression_test/Makefile.regression b/regression_test/Makefile.regression
index cc34a87f6..7aa8a5076 100644
--- a/regression_test/Makefile.regression
+++ b/regression_test/Makefile.regression
@@ -70,9 +70,9 @@ endif
 ifdef DYN
 DYNAMIC_SUFFIX = -dynamic
 ifeq ($(PLATFORM), WIN32)
-  export PATH+=:$(TTCN3_DIR)/lib:
+  export PATH:=$(PATH):$(TTCN3_DIR)/lib:
 else
-  export LD_LIBRARY_PATH+=:$(TTCN3_DIR)/lib:
+  export LD_LIBRARY_PATH:=$(LD_LIBRARY_PATH):$(TTCN3_DIR)/lib:
 endif 
 endif
 
diff --git a/regression_test/XML/XmlWorkflow/bin/prj2mk.pl b/regression_test/XML/XmlWorkflow/bin/prj2mk.pl
index 50e65f19f..063a380f9 100644
--- a/regression_test/XML/XmlWorkflow/bin/prj2mk.pl
+++ b/regression_test/XML/XmlWorkflow/bin/prj2mk.pl
@@ -153,8 +153,8 @@ while (<MAKEFILE_IN>) {
     print MAKEFILE_OUT <<MKF;
 TOPDIR := ../../..
 include   ../../../Makefile.regression
-export PATH+=:\$(TTCN3_DIR)/bin:
-export LD_LIBRARY_PATH+=:\$(ABS_SRC):\$(TTCN3_DIR)/lib:
+export PATH:=\$(PATH):\$(TTCN3_DIR)/bin:
+export LD_LIBRARY_PATH:=\$(LD_LIBRARY_PATH):\$(ABS_SRC):\$(TTCN3_DIR)/lib:
 MKF
   }
 }
diff --git a/regression_test/XML/XmlWorkflow/bin2/prj2mk.pl b/regression_test/XML/XmlWorkflow/bin2/prj2mk.pl
index 0530b6855..903a8f049 100644
--- a/regression_test/XML/XmlWorkflow/bin2/prj2mk.pl
+++ b/regression_test/XML/XmlWorkflow/bin2/prj2mk.pl
@@ -131,8 +131,8 @@ while (<MAKEFILE_IN>) {
     print MAKEFILE_OUT <<MKF;
 TOPDIR := ../../..
 include   ../../../Makefile.regression
-export PATH+=:\$(TTCN3_DIR)/bin:
-export LD_LIBRARY_PATH+=:\$(ABS_SRC):\$(TTCN3_DIR)/lib:
+export PATH:=\$(PATH):\$(TTCN3_DIR)/bin:
+export LD_LIBRARY_PATH:=\$(LD_LIBRARY_PATH):\$(ABS_SRC):\$(TTCN3_DIR)/lib:
 MKF
   }
 }
diff --git a/regression_test/cfgFile/define/macro_reference/Makefile b/regression_test/cfgFile/define/macro_reference/Makefile
index 282a62018..f04974d30 100644
--- a/regression_test/cfgFile/define/macro_reference/Makefile
+++ b/regression_test/cfgFile/define/macro_reference/Makefile
@@ -35,9 +35,9 @@ endif
 
 ifdef DYN
 ifeq ($(PLATFORM), WIN32)
-  export PATH+=:$(TTCN3_DIR)/lib:$(ABS_SRC)/$(DIR_SINGLE):$(ABS_SRC)/$(DIR_PARALLEL):
+  export PATH:=$(PATH):$(TTCN3_DIR)/lib:$(ABS_SRC)/$(DIR_SINGLE):$(ABS_SRC)/$(DIR_PARALLEL):
 else
-  export LD_LIBRARY_PATH+=:$(ABS_SRC)/$(DIR_SINGLE):$(ABS_SRC)/$(DIR_PARALLEL):
+  export LD_LIBRARY_PATH:=$(LD_LIBRARY_PATH):$(ABS_SRC)/$(DIR_SINGLE):$(ABS_SRC)/$(DIR_PARALLEL):
 endif 
 endif
 
diff --git a/regression_test/cfgFile/define/structured/Makefile b/regression_test/cfgFile/define/structured/Makefile
index d7defc992..db402b2c3 100644
--- a/regression_test/cfgFile/define/structured/Makefile
+++ b/regression_test/cfgFile/define/structured/Makefile
@@ -35,9 +35,9 @@ endif
 
 ifdef DYN
 ifeq ($(PLATFORM), WIN32)
-  export PATH+=:$(TTCN3_DIR)/lib:$(ABS_SRC)/$(DIR_SINGLE):$(ABS_SRC)/$(DIR_PARALLEL):
+  export PATH:=$(PATH):$(TTCN3_DIR)/lib:$(ABS_SRC)/$(DIR_SINGLE):$(ABS_SRC)/$(DIR_PARALLEL):
 else
-  export LD_LIBRARY_PATH+=:$(ABS_SRC)/$(DIR_SINGLE):$(ABS_SRC)/$(DIR_PARALLEL):
+  export LD_LIBRARY_PATH:=$(LD_LIBRARY_PATH):$(ABS_SRC)/$(DIR_SINGLE):$(ABS_SRC)/$(DIR_PARALLEL):
 endif 
 endif
 
diff --git a/regression_test/cfgFile/module_parameters/assignment/Makefile b/regression_test/cfgFile/module_parameters/assignment/Makefile
index 5d63334a9..58f50b465 100644
--- a/regression_test/cfgFile/module_parameters/assignment/Makefile
+++ b/regression_test/cfgFile/module_parameters/assignment/Makefile
@@ -30,9 +30,9 @@ endif
 
 ifdef DYN
 ifeq ($(PLATFORM), WIN32)
-  export PATH+=:$(TTCN3_DIR)/lib:$(ABS_SRC)/$(DIR_SINGLE):$(ABS_SRC)/$(DIR_PARALLEL):
+  export PATH:=$(PATH):$(TTCN3_DIR)/lib:$(ABS_SRC)/$(DIR_SINGLE):$(ABS_SRC)/$(DIR_PARALLEL):
 else
-  export LD_LIBRARY_PATH+=:$(ABS_SRC)/$(DIR_SINGLE):$(ABS_SRC)/$(DIR_PARALLEL):
+  export LD_LIBRARY_PATH:=$(LD_LIBRARY_PATH):$(ABS_SRC)/$(DIR_SINGLE):$(ABS_SRC)/$(DIR_PARALLEL):
 endif 
 endif
 
diff --git a/regression_test/cfgFile/module_parameters/concat/Makefile b/regression_test/cfgFile/module_parameters/concat/Makefile
index 1121a0e8b..7fadfb27a 100644
--- a/regression_test/cfgFile/module_parameters/concat/Makefile
+++ b/regression_test/cfgFile/module_parameters/concat/Makefile
@@ -30,9 +30,9 @@ endif
 
 ifdef DYN
 ifeq ($(PLATFORM), WIN32)
-  export PATH+=:$(TTCN3_DIR)/lib:$(ABS_SRC)/$(DIR_SINGLE):$(ABS_SRC)/$(DIR_PARALLEL):
+  export PATH:=$(PATH):$(TTCN3_DIR)/lib:$(ABS_SRC)/$(DIR_SINGLE):$(ABS_SRC)/$(DIR_PARALLEL):
 else
-  export LD_LIBRARY_PATH+=:$(ABS_SRC)/$(DIR_SINGLE):$(ABS_SRC)/$(DIR_PARALLEL):
+  export LD_LIBRARY_PATH:=$(LD_LIBRARY_PATH):$(ABS_SRC)/$(DIR_SINGLE):$(ABS_SRC)/$(DIR_PARALLEL):
 endif 
 endif
 
diff --git a/regression_test/cfgFile/module_parameters/nested/Makefile b/regression_test/cfgFile/module_parameters/nested/Makefile
index 37ab050d2..179169b78 100644
--- a/regression_test/cfgFile/module_parameters/nested/Makefile
+++ b/regression_test/cfgFile/module_parameters/nested/Makefile
@@ -26,9 +26,9 @@ endif
 
 ifdef DYN
 ifeq ($(PLATFORM), WIN32)
-  export PATH+=:$(TTCN3_DIR)/lib:$(ABS_SRC)/$(DIR_SINGLE):$(ABS_SRC)/$(DIR_PARALLEL):
+  export PATH:=$(PATH):$(TTCN3_DIR)/lib:$(ABS_SRC)/$(DIR_SINGLE):$(ABS_SRC)/$(DIR_PARALLEL):
 else
-  export LD_LIBRARY_PATH+=:$(ABS_SRC)/$(DIR_SINGLE):$(ABS_SRC)/$(DIR_PARALLEL):
+  export LD_LIBRARY_PATH:=$(LD_LIBRARY_PATH):$(ABS_SRC)/$(DIR_SINGLE):$(ABS_SRC)/$(DIR_PARALLEL):
 endif 
 endif
 
diff --git a/regression_test/cfgFile/module_parameters/references/Makefile b/regression_test/cfgFile/module_parameters/references/Makefile
index 9af820408..8260aaa6f 100644
--- a/regression_test/cfgFile/module_parameters/references/Makefile
+++ b/regression_test/cfgFile/module_parameters/references/Makefile
@@ -28,9 +28,9 @@ endif
 
 ifdef DYN
 ifeq ($(PLATFORM), WIN32)
-  export PATH+=:$(TTCN3_DIR)/lib:$(ABS_SRC)/$(DIR_SINGLE):$(ABS_SRC)/$(DIR_PARALLEL):
+  export PATH:=$(PATH):$(TTCN3_DIR)/lib:$(ABS_SRC)/$(DIR_SINGLE):$(ABS_SRC)/$(DIR_PARALLEL):
 else
-  export LD_LIBRARY_PATH+=:$(ABS_SRC)/$(DIR_SINGLE):$(ABS_SRC)/$(DIR_PARALLEL):
+  export LD_LIBRARY_PATH:=$(LD_LIBRARY_PATH):$(ABS_SRC)/$(DIR_SINGLE):$(ABS_SRC)/$(DIR_PARALLEL):
 endif 
 endif
 
diff --git a/regression_test/cfgFile/module_parameters/special_values/Makefile b/regression_test/cfgFile/module_parameters/special_values/Makefile
index 41129fef6..b899408dd 100644
--- a/regression_test/cfgFile/module_parameters/special_values/Makefile
+++ b/regression_test/cfgFile/module_parameters/special_values/Makefile
@@ -26,9 +26,9 @@ endif
 
 ifdef DYN
 ifeq ($(PLATFORM), WIN32)
-  export PATH+=:$(TTCN3_DIR)/lib:$(ABS_SRC)/$(DIR_SINGLE):$(ABS_SRC)/$(DIR_PARALLEL):
+  export PATH:=$(PATH):$(TTCN3_DIR)/lib:$(ABS_SRC)/$(DIR_SINGLE):$(ABS_SRC)/$(DIR_PARALLEL):
 else
-  export LD_LIBRARY_PATH+=:$(ABS_SRC)/$(DIR_SINGLE):$(ABS_SRC)/$(DIR_PARALLEL):
+  export LD_LIBRARY_PATH:=$(LD_LIBRARY_PATH):$(ABS_SRC)/$(DIR_SINGLE):$(ABS_SRC)/$(DIR_PARALLEL):
 endif 
 endif
 
diff --git a/regression_test/cfgFile/ordered_include/Makefile b/regression_test/cfgFile/ordered_include/Makefile
index 54dc21725..eba9be9bc 100644
--- a/regression_test/cfgFile/ordered_include/Makefile
+++ b/regression_test/cfgFile/ordered_include/Makefile
@@ -31,9 +31,9 @@ endif
 
 ifdef DYN
 ifeq ($(PLATFORM), WIN32)
-  export PATH+=:$(TTCN3_DIR)/lib:$(ABS_SRC)/$(DIR_SINGLE):$(ABS_SRC)/$(DIR_PARALLEL):
+  export PATH:=$(PATH):$(TTCN3_DIR)/lib:$(ABS_SRC)/$(DIR_SINGLE):$(ABS_SRC)/$(DIR_PARALLEL):
 else
-  export LD_LIBRARY_PATH+=:$(ABS_SRC)/$(DIR_SINGLE):$(ABS_SRC)/$(DIR_PARALLEL):
+  export LD_LIBRARY_PATH:=$(LD_LIBRARY_PATH):$(ABS_SRC)/$(DIR_SINGLE):$(ABS_SRC)/$(DIR_PARALLEL):
 endif 
 endif
 
diff --git a/regression_test/cfgFile/testport_parameters/Makefile b/regression_test/cfgFile/testport_parameters/Makefile
index 906e80697..bc8efad89 100644
--- a/regression_test/cfgFile/testport_parameters/Makefile
+++ b/regression_test/cfgFile/testport_parameters/Makefile
@@ -31,9 +31,9 @@ endif
 
 ifdef DYN
 ifeq ($(PLATFORM), WIN32)
-  export PATH+=:$(TTCN3_DIR)/lib:$(ABS_SRC)/$(DIR_SINGLE):$(ABS_SRC)/$(DIR_PARALLEL):
+  export PATH:=$(PATH):$(TTCN3_DIR)/lib:$(ABS_SRC)/$(DIR_SINGLE):$(ABS_SRC)/$(DIR_PARALLEL):
 else
-  export LD_LIBRARY_PATH+=:$(ABS_SRC)/$(DIR_SINGLE):$(ABS_SRC)/$(DIR_PARALLEL):
+  export LD_LIBRARY_PATH:=$(LD_LIBRARY_PATH):$(ABS_SRC)/$(DIR_SINGLE):$(ABS_SRC)/$(DIR_PARALLEL):
 endif 
 endif
 
diff --git a/regression_test/fuzzy/Makefile b/regression_test/fuzzy/Makefile
index 28987ae33..d432da017 100644
--- a/regression_test/fuzzy/Makefile
+++ b/regression_test/fuzzy/Makefile
@@ -28,9 +28,9 @@ endif
 
 ifdef DYN
 ifeq ($(PLATFORM), WIN32)
-  export PATH+=:$(TTCN3_DIR)/lib:$(ABS_SRC)/$(DIR_SINGLE):$(ABS_SRC)/$(DIR_PARALLEL):
+  export PATH:=$(PATH):$(TTCN3_DIR)/lib:$(ABS_SRC)/$(DIR_SINGLE):$(ABS_SRC)/$(DIR_PARALLEL):
 else
-  export LD_LIBRARY_PATH+=:$(ABS_SRC)/$(DIR_SINGLE):$(ABS_SRC)/$(DIR_PARALLEL):
+  export LD_LIBRARY_PATH:=$(LD_LIBRARY_PATH):$(ABS_SRC)/$(DIR_SINGLE):$(ABS_SRC)/$(DIR_PARALLEL):
 endif
 DYNFLAG := -l
 endif
diff --git a/regression_test/templateExclusiveRange/Makefile b/regression_test/templateExclusiveRange/Makefile
index 231061bb6..12c7654a3 100644
--- a/regression_test/templateExclusiveRange/Makefile
+++ b/regression_test/templateExclusiveRange/Makefile
@@ -26,9 +26,9 @@ endif
 
 ifdef DYN
 ifeq ($(PLATFORM), WIN32)
-  export PATH+=:$(TTCN3_DIR)/lib:$(ABS_SRC)/$(DIR_SINGLE):$(ABS_SRC)/$(DIR_PARALLEL):
+  export PATH:=$(PATH):$(TTCN3_DIR)/lib:$(ABS_SRC)/$(DIR_SINGLE):$(ABS_SRC)/$(DIR_PARALLEL):
 else
-  export LD_LIBRARY_PATH+=:$(ABS_SRC)/$(DIR_SINGLE):$(ABS_SRC)/$(DIR_PARALLEL):
+  export LD_LIBRARY_PATH:=$(LD_LIBRARY_PATH):$(ABS_SRC)/$(DIR_SINGLE):$(ABS_SRC)/$(DIR_PARALLEL):
 endif
 DYNFLAG := -l
 endif
-- 
GitLab