Update of /cvsroot/monetdb/pathfinder/src/tools
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9900/pathfinder/src/tools
Modified Files:
Mserver.mx prog.c
Log Message:
clean-up:
- do not install, package & distribute configure-generated <pkg>_config.h;
each pkg need to generate and include its own <pkg>_config.h, anyway.
- avoid maintaining, installing, packaging & distributing redundant
sysdefs.h[.in];
(re-)use MonetDB/sysdefs.h.in instead.
- ensure that each pkg includes its own <pkg>_config.h, only.
- replace "hacky" definitions of MONETDBPREFIX & MONETDBCONFIG
by proper(?) definitions of MONETDB[45]_PREFIX & MONETDB[45]_CONFFILE;
TODO:
on Windows, find a way to replace the hard-wired definitions
of MONETDB[45]_PREFIX & MONETDB[45]_CONFFILE
in sql/NT/sql_config.h.in & pathfinder/NT/pf_config.h.in
by proper ones that use the output of
`monetdb[45]-config --prefix` & `monetdb[45]-config --syscofdir` .
Index: prog.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/src/tools/prog.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- prog.c 7 Sep 2007 21:59:09 -0000 1.13
+++ prog.c 4 Dec 2007 01:04:30 -0000 1.14
@@ -16,7 +16,7 @@
* All Rights Reserved.
*/
-#include "monetdb4_config.h"
+#include "pf_config.h"
#include <monet_options.h>
#include "embeddedclient.h"
@@ -102,8 +102,8 @@
usage(prog);
/* needed, to prevent the MonetDB config file to be used */
- setlen = mo_add_option(&set, setlen, opt_config, "prefix",
MONETDBPREFIX);
- setlen = mo_add_option(&set, setlen, opt_config, "config",
MONETDBCONFIG);
+ setlen = mo_add_option(&set, setlen, opt_config, "prefix",
MONETDB4_PREFIX);
+ setlen = mo_add_option(&set, setlen, opt_config, "config",
MONETDB4_CONFFILE);
for (;;) {
int option_index = 0;
Index: Mserver.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/src/tools/Mserver.mx,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- Mserver.mx 15 Nov 2007 13:40:42 -0000 1.17
+++ Mserver.mx 4 Dec 2007 01:04:30 -0000 1.18
@@ -226,11 +226,8 @@
if (!(setlen = mo_builtin_settings(&set)))
usage(prog, debug, set, setlen);
-/* * MONETDBPREFIX & MONETDBCONFIG are not (yet?) available for sql;
- * use "Mserver --config=`monetdb4-config --sysconfdir`/MonetDB.conf",
instead.
- setlen = mo_add_option(&set, setlen, opt_config, "prefix",
MONETDBPREFIX);
- setlen = mo_add_option(&set, setlen, opt_config, "config",
MONETDBCONFIG);
-*/
+ setlen = mo_add_option(&set, setlen, opt_config, "prefix",
MONETDB4_PREFIX);
+ setlen = mo_add_option(&set, setlen, opt_config, "config",
MONETDB4_CONFFILE);
for (;;) {
int option_index = 0;
-------------------------------------------------------------------------
SF.Net email is sponsored by: The Future of Linux Business White Paper
from Novell. From the desktop to the data center, Linux is going
mainstream. Let it simplify your IT future.
http://altfarm.mediaplex.com/ad/ck/8857-50307-18918-4
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
