Skip to content
Snippets Groups Projects
Commit 1076e2d0 authored by Kristof Szabados's avatar Kristof Szabados
Browse files

bugfix in the way variables are concatenated

parent c42f818b
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
......@@ -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
}
}
......
......@@ -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
}
}
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment