bugfix in path and trying to fight recursivity

regression_test/XML/XmlWorkflow/bin/prj2mk.pl

@@ -134,7 +134,7 @@ while (<MAKEFILE_IN>) {
 TOPDIR := ../../..
 include   ../../../Makefile.regression
 export PATH:=\$(TTCN3_DIR)/bin:\$(PATH)
-export LD_LIBRARY_PATH:=\$(LD_LIBRARY_PATH):\$(ABS_SRC):\$(TTCN3_DIR)/lib
+export LD_LIBRARY_PATH:=\$(ABS_SRC):\$(TTCN3_DIR)/lib:\$(LD_LIBRARY_PATH)
 MKF
   }
 }

regression_test/XML/XmlWorkflow/bin2/prj2mk.pl

@@ -131,7 +131,7 @@ while (<MAKEFILE_IN>) {
 TOPDIR := ../../..
 include   ../../../Makefile.regression
 export PATH:=\$(TTCN3_DIR)/bin:\$(PATH)
-export LD_LIBRARY_PATH:=\$(LD_LIBRARY_PATH):\$(ABS_SRC):\$(TTCN3_DIR)/lib
+export LD_LIBRARY_PATH:=\$(ABS_SRC):\$(TTCN3_DIR)/lib:\$(LD_LIBRARY_PATH)
 MKF
   }
 }

regression_test/cfgFile/define/macro_reference/Makefile

@@ -34,9 +34,9 @@ endif
 
 ifdef DYN
 ifeq ($(PLATFORM), WIN32)
-  export PATH:=$(TTCN3_DIR)/lib:$(PATH):$(ABS_SRC)/$(DIR_SINGLE):$(ANS_SRC)/$(DIR_PARALLEL)
+  export PATH:=$(TTCN3_DIR)/lib:$(ABS_SRC)/$(DIR_SINGLE):$(ABS_SRC)/$(DIR_PARALLEL):$(PATH)
 else
-  export LD_LIBRARY_PATH:=$(LD_LIBRARY_PATH):$(ABS_SRC)/$(DIR_SINGLE):$(ANS_SRC)/$(DIR_PARALLEL)
+  export LD_LIBRARY_PATH:=$(ABS_SRC)/$(DIR_SINGLE):$(ABS_SRC)/$(DIR_PARALLEL):$(LD_LIBRARY_PATH)
 endif 
 endif
 

regression_test/cfgFile/define/structured/Makefile

@@ -34,9 +34,9 @@ endif
 
 ifdef DYN
 ifeq ($(PLATFORM), WIN32)
-  export PATH:=$(TTCN3_DIR)/lib:$(PATH):$(ABS_SRC)/$(DIR_SINGLE):$(ANS_SRC)/$(DIR_PARALLEL)
+  export PATH:=$(TTCN3_DIR)/lib:$(ABS_SRC)/$(DIR_SINGLE):$(ABS_SRC)/$(DIR_PARALLEL):$(PATH)
 else
-  export LD_LIBRARY_PATH:=$(LD_LIBRARY_PATH):$(ABS_SRC)/$(DIR_SINGLE):$(ANS_SRC)/$(DIR_PARALLEL)
+  export LD_LIBRARY_PATH:=$(ABS_SRC)/$(DIR_SINGLE):$(ABS_SRC)/$(DIR_PARALLEL):$(LD_LIBRARY_PATH)
 endif 
 endif
 

regression_test/cfgFile/module_parameters/assignment/Makefile

@@ -29,9 +29,9 @@ endif
 
 ifdef DYN
 ifeq ($(PLATFORM), WIN32)
-  export PATH:=$(TTCN3_DIR)/lib:$(PATH):$(ABS_SRC)/$(DIR_SINGLE):$(ANS_SRC)/$(DIR_PARALLEL)
+  export PATH:=$(TTCN3_DIR)/lib:$(ABS_SRC)/$(DIR_SINGLE):$(ABS_SRC)/$(DIR_PARALLEL):$(PATH)
 else
-  export LD_LIBRARY_PATH:=$(LD_LIBRARY_PATH):$(ABS_SRC)/$(DIR_SINGLE):$(ANS_SRC)/$(DIR_PARALLEL)
+  export LD_LIBRARY_PATH:=$(ABS_SRC)/$(DIR_SINGLE):$(ABS_SRC)/$(DIR_PARALLEL):$(LD_LIBRARY_PATH)
 endif 
 endif
 

regression_test/cfgFile/module_parameters/concat/Makefile

@@ -29,9 +29,9 @@ endif
 
 ifdef DYN
 ifeq ($(PLATFORM), WIN32)
-  export PATH:=$(TTCN3_DIR)/lib:$(PATH):$(ABS_SRC)/$(DIR_SINGLE):$(ANS_SRC)/$(DIR_PARALLEL)
+  export PATH:=$(TTCN3_DIR)/lib:$(ABS_SRC)/$(DIR_SINGLE):$(ABS_SRC)/$(DIR_PARALLEL):$(PATH)
 else
-  export LD_LIBRARY_PATH:=$(LD_LIBRARY_PATH):$(ABS_SRC)/$(DIR_SINGLE):$(ANS_SRC)/$(DIR_PARALLEL)
+  export LD_LIBRARY_PATH:=$(ABS_SRC)/$(DIR_SINGLE):$(ABS_SRC)/$(DIR_PARALLEL):$(LD_LIBRARY_PATH)
 endif 
 endif
 

regression_test/cfgFile/module_parameters/references/Makefile

@@ -27,9 +27,9 @@ endif
 
 ifdef DYN
 ifeq ($(PLATFORM), WIN32)
-  export PATH:=$(TTCN3_DIR)/lib:$(PATH):$(ABS_SRC)/$(DIR_SINGLE):$(ANS_SRC)/$(DIR_PARALLEL)
+  export PATH:=$(TTCN3_DIR)/lib:$(ABS_SRC)/$(DIR_SINGLE):$(ABS_SRC)/$(DIR_PARALLEL):$(PATH)
 else
-  export LD_LIBRARY_PATH:=$(LD_LIBRARY_PATH):$(ABS_SRC)/$(DIR_SINGLE):$(ANS_SRC)/$(DIR_PARALLEL)
+  export LD_LIBRARY_PATH:=$(ABS_SRC)/$(DIR_SINGLE):$(ABS_SRC)/$(DIR_PARALLEL):$(LD_LIBRARY_PATH)
 endif 
 endif
 

regression_test/cfgFile/ordered_include/Makefile

@@ -30,9 +30,9 @@ endif
 
 ifdef DYN
 ifeq ($(PLATFORM), WIN32)
-  export PATH:=$(TTCN3_DIR)/lib:$(PATH):$(ABS_SRC)/$(DIR_SINGLE):$(ANS_SRC)/$(DIR_PARALLEL)
+  export PATH:=$(TTCN3_DIR)/lib:$(ABS_SRC)/$(DIR_SINGLE):$(ABS_SRC)/$(DIR_PARALLEL):$(PATH)
 else
-  export LD_LIBRARY_PATH:=$(LD_LIBRARY_PATH):$(ABS_SRC)/$(DIR_SINGLE):$(ANS_SRC)/$(DIR_PARALLEL)
+  export LD_LIBRARY_PATH:=$(ABS_SRC)/$(DIR_SINGLE):$(ABS_SRC)/$(DIR_PARALLEL):$(LD_LIBRARY_PATH)
 endif 
 endif
 

regression_test/cfgFile/testport_parameters/Makefile

@@ -30,9 +30,9 @@ endif
 
 ifdef DYN
 ifeq ($(PLATFORM), WIN32)
-  export PATH:=$(TTCN3_DIR)/lib:$(PATH):$(ABS_SRC)/$(DIR_SINGLE):$(ANS_SRC)/$(DIR_PARALLEL)
+  export PATH:=$(TTCN3_DIR)/lib:$(ABS_SRC)/$(DIR_SINGLE):$(ABS_SRC)/$(DIR_PARALLEL):$(PATH)
 else
-  export LD_LIBRARY_PATH:=$(LD_LIBRARY_PATH):$(ABS_SRC)/$(DIR_SINGLE):$(ANS_SRC)/$(DIR_PARALLEL)
+  export LD_LIBRARY_PATH:=$(ABS_SRC)/$(DIR_SINGLE):$(ABS_SRC)/$(DIR_PARALLEL):$(LD_LIBRARY_PATH)
 endif 
 endif