Update of /cvsroot/monetdb/MonetDB/conf
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv689/conf
Modified Files:
Tag: GDK-2
monetdb-config.bat.in monetdb-config.in
Removed Files:
Tag: GDK-2
conf.bash
Log Message:
propagated changes of Monday Sep 10 2007 - Tuesday Sep 18 2007
from the development trunk to the GDK-2 branch
Index: monetdb-config.bat.in
===================================================================
RCS file: /cvsroot/monetdb/MonetDB/conf/monetdb-config.bat.in,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -u -d -r1.4 -r1.4.4.1
--- monetdb-config.bat.in 24 Jan 2007 23:41:15 -0000 1.4
+++ monetdb-config.bat.in 18 Sep 2007 12:51:35 -0000 1.4.4.1
@@ -22,6 +22,7 @@
set pkglibdir=%libdir%\%pkg%
set pkgdatadir=%datadir%\%pkg%
set pkgincludedir=%includedir%\%pkg%
+set [EMAIL PROTECTED]@
if "%1" == "" goto usage
@@ -51,6 +52,7 @@
if "%1" == "--pkgdatadir" echo %pkgdatadir% & goto shift
if "%1" == "--pkglibdir" echo %pkglibdir% & goto shift
if "%1" == "--pkgincludedir" echo %pkgincludedir% & goto shift
+if "%1" == "--pythonlibdir" echo %pythonlibdir% & goto shift
:usage
echo.
@@ -67,5 +69,6 @@
echo --prefix --exec-prefix --bindir --libexecdir --datadir
echo --sysconfdir --localstatedir --libdir --infodir
echo --mandir --includedir --pkgdatadir --pkglibdir --pkgincludedir
+ echo --pythonlibdir
echo.
--- conf.bash DELETED ---
Index: monetdb-config.in
===================================================================
RCS file: /cvsroot/monetdb/MonetDB/conf/monetdb-config.in,v
retrieving revision 1.3
retrieving revision 1.3.6.1
diff -u -d -r1.3 -r1.3.6.1
--- monetdb-config.in 4 Jan 2007 16:09:02 -0000 1.3
+++ monetdb-config.in 18 Sep 2007 12:51:36 -0000 1.3.6.1
@@ -36,6 +36,7 @@
pkglibdir="${libdir}/${pkg}"
pkgdatadir="${datadir}/${pkg}"
pkgincludedir="${includedir}/${pkg}"
+pythonlibdir="${prefix}/@PYTHON_LIBDIR@"
usage()
{
@@ -55,6 +56,7 @@
--prefix --exec-prefix --bindir --libexecdir --datarootdir
--datadir --sysconfdir --localstatedir --libdir --infodir
--mandir --includedir --pkgdatadir --pkglibdir --pkgincludedir
+ --pythonlibdir
EOF
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
