Update of /cvsroot/monetdb/clients/src/java/scripts
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv31067/scripts
Modified Files:
Tag: Clients_1-18
Makefile.ag mjclient.bat.in mjclient.in
Log Message:
Merged HEAD into Clients_1-18
Index: mjclient.bat.in
===================================================================
RCS file: /cvsroot/monetdb/clients/src/java/scripts/mjclient.bat.in,v
retrieving revision 1.1
retrieving revision 1.1.6.1
diff -u -d -r1.1 -r1.1.6.1
--- mjclient.bat.in 8 Jan 2007 14:03:39 -0000 1.1
+++ mjclient.bat.in 16 Aug 2007 10:52:44 -0000 1.1.6.1
@@ -21,4 +21,4 @@
@rem Future versions might inspect a database of eligible servers
@rem to direct the interaction to the proper ports.
-call java -jar @[EMAIL PROTECTED]@JDBCCLIENT_JAR@ %*
+call java -jar @[EMAIL PROTECTED] %*
Index: mjclient.in
===================================================================
RCS file: /cvsroot/monetdb/clients/src/java/scripts/mjclient.in,v
retrieving revision 1.3
retrieving revision 1.3.6.1
diff -u -d -r1.3 -r1.3.6.1
--- mjclient.in 3 Jan 2007 12:17:27 -0000 1.3
+++ mjclient.in 16 Aug 2007 10:52:44 -0000 1.3.6.1
@@ -23,4 +23,4 @@
# to direct the interaction to the proper ports.
[EMAIL PROTECTED]@
-exec java -jar @datadir@/MonetDB/lib/@JDBCCLIENT_JAR@ $*
+exec java -jar @datadir@/MonetDB/lib/jdbcclient.jar $*
Index: Makefile.ag
===================================================================
RCS file: /cvsroot/monetdb/clients/src/java/scripts/Makefile.ag,v
retrieving revision 1.3
retrieving revision 1.3.6.1
diff -u -d -r1.3 -r1.3.6.1
--- Makefile.ag 8 Jan 2007 14:03:39 -0000 1.3
+++ Makefile.ag 16 Aug 2007 10:52:43 -0000 1.3.6.1
@@ -17,12 +17,14 @@
MTSAFE
scripts_sh = {
- NOINST
+ COND = NOT_WIN32
+ DIR = bindir
EXT = ""
SOURCES = mjclient.in
}
scripts_bat = {
- NOINST
+ COND = NATIVE_WIN32
+ DIR = bindir
SOURCES = mjclient.bat.in
}
-------------------------------------------------------------------------
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
