Update of /cvsroot/monetdb/MonetDB/conf
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv27045/conf
Modified Files:
Tag: GDK-2
configure.py monetdb-config.bat.in
Log Message:
propagated changes of Monday Sep 24 2007 - Wednesday Oct 03 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.4.1
retrieving revision 1.4.4.2
diff -u -d -r1.4.4.1 -r1.4.4.2
--- monetdb-config.bat.in 18 Sep 2007 12:51:35 -0000 1.4.4.1
+++ monetdb-config.bat.in 3 Oct 2007 14:50:35 -0000 1.4.4.2
@@ -53,6 +53,7 @@
if "%1" == "--pkglibdir" echo %pkglibdir% & goto shift
if "%1" == "--pkgincludedir" echo %pkgincludedir% & goto shift
if "%1" == "--pythonlibdir" echo %pythonlibdir% & goto shift
+if "%1" == "--internal" goto shift
:usage
echo.
Index: configure.py
===================================================================
RCS file: /cvsroot/monetdb/MonetDB/conf/configure.py,v
retrieving revision 1.3.4.1
retrieving revision 1.3.4.2
diff -u -d -r1.3.4.1 -r1.3.4.2
--- configure.py 10 Sep 2007 14:21:57 -0000 1.3.4.1
+++ configure.py 3 Oct 2007 14:50:32 -0000 1.3.4.2
@@ -20,21 +20,22 @@
import fileinput
import os
-subs = [("@bindir@", r'${exec_prefix}\bin'),
- ("@sbindir@", r'${exec_prefix}\sbin'),
- ("@libexecdir@", r'${exec_prefix}\libexec'),
- ("@datadir@", r'${prefix}\share'),
- ("@sysconfdir@", r'${prefix}\etc'),
- ("@sharedstatedir@", r'${prefix}\com'),
- ("@localstatedir@", r'${prefix}\var'),
- ("@libdir@", r'${exec_prefix}\lib'),
- ("@infodir@", r'${prefix}\info'),
- ("@mandir@", r'${prefix}\man'),
- ("@includedir@", r'${prefix}\include'),
+subs = [("@bindir@", r'%exec_prefix%\bin'),
+ ("@sbindir@", r'%exec_prefix%\sbin'),
+ ("@libexecdir@", r'%exec_prefix%\libexec'),
+ ("@datadir@", r'%prefix%\share'),
+ ("@datarootdir@", r'%prefix%\share'),
+ ("@sysconfdir@", r'%prefix%\etc'),
+ ("@sharedstatedir@", r'%prefix%\com'),
+ ("@localstatedir@", r'%prefix%\var'),
+ ("@libdir@", r'%exec_prefix%\lib'),
+ ("@infodir@", r'%prefix%\info'),
+ ("@mandir@", r'%prefix%\man'),
+ ("@includedir@", r'%prefix%\include'),
("@oldincludedir@", r'\usr\include'),
- ("@pkgdatadir@", r'[EMAIL PROTECTED]@'),
- ("@pkglibdir@", r'[EMAIL PROTECTED]@'),
- ("@pkgincludedir@", r'[EMAIL PROTECTED]@'),
+ ("@pkgdatadir@", r'[EMAIL PROTECTED]@'),
+ ("@pkglibdir@", r'[EMAIL PROTECTED]@'),
+ ("@pkgincludedir@", r'[EMAIL PROTECTED]@'),
("@DIRSEP@", '\\'),
("@CROSS_COMPILING_FALSE@", ''),
("@LINK_STATIC_FALSE@", ''),
-------------------------------------------------------------------------
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-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
