From 1076e2d0c358a58871e5f87449e8c1f098de3965 Mon Sep 17 00:00:00 2001
From: kristof <Kristof.Szabados@ericsson.com>
Date: Thu, 21 Apr 2016 09:36:06 +0200
Subject: [PATCH] bugfix in the way variables are concatenated
---
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/references/Makefile | 4 ++--
regression_test/cfgFile/ordered_include/Makefile | 4 ++--
regression_test/cfgFile/testport_parameters/Makefile | 4 ++--
10 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/regression_test/Makefile.regression b/regression_test/Makefile.regression
index ad9bd18cf..9357b0449 100644
--- a/regression_test/Makefile.regression
+++ b/regression_test/Makefile.regression
@@ -60,9 +60,9 @@ endif
ifdef DYN
DYNAMIC_SUFFIX = -dynamic
ifeq ($(PLATFORM), WIN32)
- export PATH:=$(TTCN3_DIR)/lib:$(PATH)
+ export PATH+=:$(TTCN3_DIR)/lib:
else
- export LD_LIBRARY_PATH:=$(TTCN3_DIR)/lib:$(LD_LIBRARY_PATH):$(ABS_SRC)
+ export 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 15e98cd71..cce9403a2 100644
--- a/regression_test/XML/XmlWorkflow/bin/prj2mk.pl
+++ b/regression_test/XML/XmlWorkflow/bin/prj2mk.pl
@@ -133,8 +133,8 @@ while (<MAKEFILE_IN>) {
print MAKEFILE_OUT <<MKF;
TOPDIR := ../../..
include ../../../Makefile.regression
-export PATH:=\$(TTCN3_DIR)/bin:\$(PATH)
-export LD_LIBRARY_PATH:=\$(ABS_SRC):\$(TTCN3_DIR)/lib
+export PATH+=:\$(TTCN3_DIR)/bin:
+export 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 5dec96b7e..6fff1c7f7 100644
--- a/regression_test/XML/XmlWorkflow/bin2/prj2mk.pl
+++ b/regression_test/XML/XmlWorkflow/bin2/prj2mk.pl
@@ -130,8 +130,8 @@ while (<MAKEFILE_IN>) {
print MAKEFILE_OUT <<MKF;
TOPDIR := ../../..
include ../../../Makefile.regression
-export PATH:=\$(TTCN3_DIR)/bin:\$(PATH)
-export LD_LIBRARY_PATH:=\$(ABS_SRC):\$(TTCN3_DIR)/lib
+export PATH+=:\$(TTCN3_DIR)/bin:
+export 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 308046495..37842c4ac 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:$(ABS_SRC)/$(DIR_SINGLE):$(ABS_SRC)/$(DIR_PARALLEL):$(PATH)
+ export 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):$(LD_LIBRARY_PATH)
+ export 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 0846e4585..d131aeddd 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:$(ABS_SRC)/$(DIR_SINGLE):$(ABS_SRC)/$(DIR_PARALLEL):$(PATH)
+ export 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):$(LD_LIBRARY_PATH)
+ export 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 81e5e5e60..97e3f6d65 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:$(ABS_SRC)/$(DIR_SINGLE):$(ABS_SRC)/$(DIR_PARALLEL):$(PATH)
+ export 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):$(LD_LIBRARY_PATH)
+ export 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 3ec0e7c08..22e71edec 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:$(ABS_SRC)/$(DIR_SINGLE):$(ABS_SRC)/$(DIR_PARALLEL):$(PATH)
+ export 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):$(LD_LIBRARY_PATH)
+ export 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 30f9e0d8a..bc0452d8a 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:$(ABS_SRC)/$(DIR_SINGLE):$(ABS_SRC)/$(DIR_PARALLEL):$(PATH)
+ export 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):$(LD_LIBRARY_PATH)
+ export 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 0b313abac..281268697 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:$(ABS_SRC)/$(DIR_SINGLE):$(ABS_SRC)/$(DIR_PARALLEL):$(PATH)
+ export 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):$(LD_LIBRARY_PATH)
+ export 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 d879490b9..1012a2869 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:$(ABS_SRC)/$(DIR_SINGLE):$(ABS_SRC)/$(DIR_PARALLEL):$(PATH)
+ export 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):$(LD_LIBRARY_PATH)
+ export LD_LIBRARY_PATH+=:$(ABS_SRC)/$(DIR_SINGLE):$(ABS_SRC)/$(DIR_PARALLEL):
endif
endif
--
GitLab