Update of /cvsroot/monetdb/sql/conf
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv24413/conf
Modified Files:
monetdb-sql-config.bat.in monetdb-sql-config.in
Log Message:
equip monetdb-sql-config with --modpath[45] options to reveal location of
SQL/[45] modules
as required by geom's RunMtest / make check (in case sql uses different prefix
than M4/5
as e.g., with nightly testing)
Index: monetdb-sql-config.bat.in
===================================================================
RCS file: /cvsroot/monetdb/sql/conf/monetdb-sql-config.bat.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- monetdb-sql-config.bat.in 22 Aug 2007 15:58:38 -0000 1.2
+++ monetdb-sql-config.bat.in 22 Aug 2007 20:47:32 -0000 1.3
@@ -9,6 +9,11 @@
set [EMAIL PROTECTED]@
set [EMAIL PROTECTED]@
set [EMAIL PROTECTED]@
+set [EMAIL PROTECTED]@
+set M4libdir=%libdir%\MonetDB4
+set M5libdir=%libdir%\MonetDB5
+set modpath4=%M4libdir%
+set modpath5=%M5libdir%
if "%1" == "" goto usage
@@ -23,6 +28,8 @@
if "%1" == "--source" echo %source% & goto shift
if "%1" == "--build" echo %build% & goto shift
if "%1" == "--prefix" echo %prefix% & goto shift
+if "%1" == "--modpath4" echo %modpath4% & goto shift
+if "%1" == "--modpath5" echo %modpath5% & goto shift
:usage
echo.
@@ -32,6 +39,8 @@
echo.
echo --build print %pkg% build directory
echo --source print %pkg% source directory
+ echo --modpath4 print default %pkg%/4 module directory
+ echo --modpath5 print default %pkg%/5 module directory
echo --help display this help and exit
echo.
echo Install directories %pkg% was configured to
Index: monetdb-sql-config.in
===================================================================
RCS file: /cvsroot/monetdb/sql/conf/monetdb-sql-config.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- monetdb-sql-config.in 18 Aug 2007 22:38:05 -0000 1.1
+++ monetdb-sql-config.in 22 Aug 2007 20:47:32 -0000 1.2
@@ -23,6 +23,10 @@
build="@QSQL_BUILD@"
prefix="@Qprefix@"
+libdir="@Qlibdir@"
+M4libdir="${libdir}/MonetDB4"
+M5libdir="${libdir}/MonetDB5"
+
usage()
{
cat <<EOF
@@ -32,6 +36,8 @@
--build print ${pkg} build directory
--source print ${pkg} source directory
+ --modpath4 print default ${pkg}/4 module path
+ --modpath5 print default ${pkg}/5 module path
--help display this help and exit
Install directories ${pkg} was configured to
@@ -66,6 +72,14 @@
echo $source
;;
+ --modpath4)
+ echo $M4libdir:$M4libdir/lib:$M4libdir/bin
+ ;;
+
+ --modpath5)
+ echo $M5libdir:$M5libdir/lib:$M5libdir/bin
+ ;;
+
--help)
usage 0
;;
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
