Fix PATH-type variables (no more space in concatenated strings)

Signed-off-by: Aron Simon <aron.simon@sigmatechnology.se>

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
 

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
   }
 }

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
   }
 }

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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

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