Changeset: 04f3ce70bff7 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=04f3ce70bff7
Modified Files:
geom/RunMtest.in
pathfinder/RunMtest.in
sql/RunMtest.in
template/RunMtest.in
Branch: default
Log Message:
fixed MOD_PATH setting
diffs (84 lines):
diff --git a/geom/RunMtest.in b/geom/RunMtest.in
--- a/geom/RunMtest.in
+++ b/geom/RunMtest.in
@@ -51,7 +51,7 @@
# where compiled monetdb4 modules are to be found
for d in modules/plain modules/contrib modules/calibrator modules/mapi
@HAVE_NETCDF_TRUE@ modules/mnetcdf
do
- MOD_PATH="${MOD_PATH}${buildbase}/monetdb4/$d/.libs:${builddir}/$d:"
+
MOD_PATH="${MOD_PATH}${buildbase}/monetdb4/$d/.libs:${buildbase}/monetdb4/$d:"
done
MOD_PATH="${MOD_PATH}${srcdir}/../monetdb4/scripts/tools"
;;
@@ -59,7 +59,7 @@
# where compiled SQL modules are to be found
for d in backends/monet5 sql
do
- MOD_PATH="${MOD_PATH}${buildbase}/sql/$d/.libs:${builddir}/$d:"
+ MOD_PATH="${MOD_PATH}${buildbase}/sql/$d/.libs:${buildbase}/sql/$d:"
# enable auto-loading of modules before `make install`
mkdir -p ${buildbase}/sql/$d/autoload
cp -f ${srcdir}/../sql/$d/[0-9][0-9]_*.mal
${buildbase}/sql/$d/autoload/ 2>/dev/null
@@ -67,7 +67,7 @@
# where compiled monetdb5 modules are to be found
for d in compiler optimizer scheduler modules/atoms modules/kernel modules/mal
modules/mal/crackers modules/mal/rdf
do
- MOD_PATH="${MOD_PATH}${buildbase}/monetdb5/$d/.libs:${builddir}/$d:"
+
MOD_PATH="${MOD_PATH}${buildbase}/monetdb5/$d/.libs:${buildbase}/monetdb5/$d:"
# enable auto-loading of modules before `make install`
mkdir -p ${buildbase}/monetdb5/$d/autoload
cp -f ${srcdir}/../monetdb5/$d/[0-9][0-9]_*.mal
${buildbase}/monetdb5/$d/autoload/ 2>/dev/null
diff --git a/pathfinder/RunMtest.in b/pathfinder/RunMtest.in
--- a/pathfinder/RunMtest.in
+++ b/pathfinder/RunMtest.in
@@ -50,7 +50,7 @@
# where compiled monetdb4 modules are to be found
for d in modules/plain modules/contrib modules/calibrator modules/mapi
@HAVE_NETCDF_TRUE@ modules/mnetcdf
do
- MOD_PATH="${MOD_PATH}${buildbase}/monetdb4/$d/.libs:${builddir}/$d:"
+
MOD_PATH="${MOD_PATH}${buildbase}/monetdb4/$d/.libs:${buildbase}/monetdb4/$d:"
done
MOD_PATH="${MOD_PATH}${srcdir}/../monetdb4/scripts/tools"
;;
@@ -58,7 +58,7 @@
# where compiled monetdb5 modules are to be found
for d in compiler optimizer scheduler modules/atoms modules/kernel modules/mal
extras/crackers extras/rdf
do
- MOD_PATH="${MOD_PATH}${buildbase}/monetdb5/$d/.libs:${builddir}/$d:"
+
MOD_PATH="${MOD_PATH}${buildbase}/monetdb5/$d/.libs:${buildbase}/monetdb5/$d:"
# enable auto-loading of modules before `make install`
mkdir -p ${buildbase}/monetdb5/$d/autoload
cp -f ${srcdir}/../monetdb5/$d/[0-9][0-9]_*.mal
${buildbase}/monetdb5/$d/autoload/ 2>/dev/null
diff --git a/sql/RunMtest.in b/sql/RunMtest.in
--- a/sql/RunMtest.in
+++ b/sql/RunMtest.in
@@ -36,7 +36,7 @@
# where compiled monetdb5 modules are to be found
for d in compiler optimizer scheduler modules/atoms modules/kernel modules/mal
extras/crackers extras/rdf
do
- MOD_PATH="${MOD_PATH}${buildbase}/monetdb5/$d/.libs:${builddir}/$d:"
+
MOD_PATH="${MOD_PATH}${buildbase}/monetdb5/$d/.libs:${buildbase}/monetdb5/$d:"
# enable auto-loading of modules before `make install`
mkdir -p ${buildbase}/monetdb5/$d/autoload
cp -f ${srcdir}/../monetdb5/$d/[0-9][0-9]_*.mal
${buildbase}/monetdb5/$d/autoload/ 2>/dev/null
diff --git a/template/RunMtest.in b/template/RunMtest.in
--- a/template/RunMtest.in
+++ b/template/RunMtest.in
@@ -48,7 +48,7 @@
# where compiled monetdb4 modules are to be found
for d in modules/plain modules/contrib modules/calibrator modules/mapi
@HAVE_NETCDF_TRUE@ modules/mnetcdf
do
- MOD_PATH="${MOD_PATH}${buildbase}/monetdb4/$d/.libs:${builddir}/$d:"
+
MOD_PATH="${MOD_PATH}${buildbase}/monetdb4/$d/.libs:${buildbase}/monetdb4/$d:"
done
MOD_PATH="${MOD_PATH}${srcdir}/../monetdb4/scripts/tools"
;;
@@ -56,7 +56,7 @@
# where compiled monetdb5 modules are to be found
for d in compiler optimizer scheduler modules/atoms modules/kernel modules/mal
extras/crackers extras/rdf
do
- MOD_PATH="${MOD_PATH}${buildbase}/monetdb5/$d/.libs:${builddir}/$d:"
+
MOD_PATH="${MOD_PATH}${buildbase}/monetdb5/$d/.libs:${buildbase}/monetdb5/$d:"
# enable auto-loading of modules before `make install`
mkdir -p ${buildbase}/monetdb5/$d/autoload
cp -f ${srcdir}/../monetdb5/$d/[0-9][0-9]_*.mal
${buildbase}/monetdb5/$d/autoload/ 2>/dev/null
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
