From 76f882b2fb23bd7ff25463a8700a231282c39b75 Mon Sep 17 00:00:00 2001
From: kristof <Kristof.Szabados@ericsson.com>
Date: Wed, 20 Apr 2016 08:49:50 +0200
Subject: [PATCH] bugfix in path and trying to fight recursivity
---
regression_test/XML/XmlWorkflow/bin/prj2mk.pl | 2 +-
regression_test/XML/XmlWorkflow/bin2/prj2mk.pl | 2 +-
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/references/Makefile | 4 ++--
regression_test/cfgFile/ordered_include/Makefile | 4 ++--
regression_test/cfgFile/testport_parameters/Makefile | 4 ++--
9 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/regression_test/XML/XmlWorkflow/bin/prj2mk.pl b/regression_test/XML/XmlWorkflow/bin/prj2mk.pl
index eaf489795..33a44b7e9 100644
--- a/regression_test/XML/XmlWorkflow/bin/prj2mk.pl
+++ b/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
}
}
diff --git a/regression_test/XML/XmlWorkflow/bin2/prj2mk.pl b/regression_test/XML/XmlWorkflow/bin2/prj2mk.pl
index 582f306a8..06983895c 100644
--- a/regression_test/XML/XmlWorkflow/bin2/prj2mk.pl
+++ b/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
}
}
diff --git a/regression_test/cfgFile/define/macro_reference/Makefile b/regression_test/cfgFile/define/macro_reference/Makefile
index 296691596..308046495 100644
--- a/regression_test/cfgFile/define/macro_reference/Makefile
+++ b/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
diff --git a/regression_test/cfgFile/define/structured/Makefile b/regression_test/cfgFile/define/structured/Makefile
index 8083105c2..0846e4585 100644
--- a/regression_test/cfgFile/define/structured/Makefile
+++ b/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
diff --git a/regression_test/cfgFile/module_parameters/assignment/Makefile b/regression_test/cfgFile/module_parameters/assignment/Makefile
index 6a21b841d..81e5e5e60 100644
--- a/regression_test/cfgFile/module_parameters/assignment/Makefile
+++ b/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
diff --git a/regression_test/cfgFile/module_parameters/concat/Makefile b/regression_test/cfgFile/module_parameters/concat/Makefile
index c93301bfc..3ec0e7c08 100644
--- a/regression_test/cfgFile/module_parameters/concat/Makefile
+++ b/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
diff --git a/regression_test/cfgFile/module_parameters/references/Makefile b/regression_test/cfgFile/module_parameters/references/Makefile
index a9d2880bd..30f9e0d8a 100644
--- a/regression_test/cfgFile/module_parameters/references/Makefile
+++ b/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
diff --git a/regression_test/cfgFile/ordered_include/Makefile b/regression_test/cfgFile/ordered_include/Makefile
index 81c853fc6..0b313abac 100644
--- a/regression_test/cfgFile/ordered_include/Makefile
+++ b/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
diff --git a/regression_test/cfgFile/testport_parameters/Makefile b/regression_test/cfgFile/testport_parameters/Makefile
index 6fa4a263b..d879490b9 100644
--- a/regression_test/cfgFile/testport_parameters/Makefile
+++ b/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
--
GitLab