This might be a better style

diff --git a/regression_test/XML/XmlWorkflow/Makefile b/regression_test/XML/XmlWorkflow/Makefile
index afd2e91c3994eea8efa9e52003d0d60d8758de75..11e92f59bcec009b8a8f3786ce7c65a2f9377be1 100644 (file)
--- 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 (executable)
new mode 100644 (file)
index abcbe4c..7d11e0e
--- 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 (executable)
new mode 100644 (file)
index ada56d8..2ec3315
--- 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
   }
 }