From 4d00b3b907423dbffc4de40e7aa3554b3c2f1839 Mon Sep 17 00:00:00 2001
From: kristof <Kristof.Szabados@ericsson.com>
Date: Tue, 19 Apr 2016 10:01:54 +0200
Subject: [PATCH] This might be a better style
---
regression_test/XML/XmlWorkflow/Makefile | 2 --
regression_test/XML/XmlWorkflow/bin/prj2mk.pl | 1 +
regression_test/XML/XmlWorkflow/bin2/prj2mk.pl | 1 +
3 files changed, 2 insertions(+), 2 deletions(-)
mode change 100755 => 100644 regression_test/XML/XmlWorkflow/bin/prj2mk.pl
mode change 100755 => 100644 regression_test/XML/XmlWorkflow/bin2/prj2mk.pl
diff --git a/regression_test/XML/XmlWorkflow/Makefile b/regression_test/XML/XmlWorkflow/Makefile
index afd2e91c3..11e92f59b 100644
--- a/regression_test/XML/XmlWorkflow/Makefile
+++ b/regression_test/XML/XmlWorkflow/Makefile
@@ -38,7 +38,6 @@ all1: bin/Makefile
$(MAKE) -C bin all
run1: bin/Makefile
- export LD_LIBRARY_PATH=$$LD_LIBRARY_PATH_ORIG:$(ABS_SRC)/XmlWorkflow/bin/; \
$(MAKE) -C bin run
clean1:
@@ -53,7 +52,6 @@ all2: bin2/Makefile
$(MAKE) -C bin2 all
run2: bin2/Makefile
- export LD_LIBRARY_PATH=$$LD_LIBRARY_PATH_ORIG:$(ABS_SRC)/XmlWorkflow/bin2/; \
$(MAKE) -C bin2 run
clean2:
diff --git a/regression_test/XML/XmlWorkflow/bin/prj2mk.pl b/regression_test/XML/XmlWorkflow/bin/prj2mk.pl
old mode 100755
new mode 100644
index abcbe4cc8..7d11e0e7b
--- a/regression_test/XML/XmlWorkflow/bin/prj2mk.pl
+++ b/regression_test/XML/XmlWorkflow/bin/prj2mk.pl
@@ -134,6 +134,7 @@ while (<MAKEFILE_IN>) {
TOPDIR := ../../..
include ../../../Makefile.regression
export PATH:=\$(TTCN3_DIR)/bin:\$(PATH)
+export LD_LIBRARY_PATH:=\$(LD_LIBRARY_PATH):\$(ABS_SRC)/XmlWorkflow/bin:\$(TTCN3_DIR)/lib
MKF
}
}
diff --git a/regression_test/XML/XmlWorkflow/bin2/prj2mk.pl b/regression_test/XML/XmlWorkflow/bin2/prj2mk.pl
old mode 100755
new mode 100644
index ada56d89e..2ec33151e
--- a/regression_test/XML/XmlWorkflow/bin2/prj2mk.pl
+++ b/regression_test/XML/XmlWorkflow/bin2/prj2mk.pl
@@ -131,6 +131,7 @@ while (<MAKEFILE_IN>) {
TOPDIR := ../../..
include ../../../Makefile.regression
export PATH:=\$(TTCN3_DIR)/bin:\$(PATH)
+export LD_LIBRARY_PATH:=\$(LD_LIBRARY_PATH):\$(ABS_SRC)/XmlWorkflow/bin:\$(TTCN3_DIR)/lib
MKF
}
}
--
GitLab