Update of /cvsroot/monetdb/MonetDB5/src/tools
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9900/MonetDB5/src/tools
Modified Files:
monet_version.c.in mserver5.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/MonetDB5/src/tools/prog.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- prog.c 7 Sep 2007 21:59:09 -0000 1.10
+++ prog.c 4 Dec 2007 01:04:28 -0000 1.11
@@ -102,8 +102,8 @@
usage(prog);
/* needed to prevent the MonetDB config file from being 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",
MONETDB5_PREFIX);
+ setlen = mo_add_option(&set, setlen, opt_config, "config",
MONETDB5_CONFFILE);
for (;;) {
int option_index = 0;
Index: mserver5.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/tools/mserver5.mx,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- mserver5.mx 14 Nov 2007 12:52:50 -0000 1.33
+++ mserver5.mx 4 Dec 2007 01:04:28 -0000 1.34
@@ -316,8 +316,8 @@
if (!(setlen = mo_builtin_settings(&set)))
usage(prog);
- 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",
MONETDB5_PREFIX);
+ setlen = mo_add_option(&set, setlen, opt_config, "config",
MONETDB5_CONFFILE);
for (;;) {
int option_index = 0;
Index: monet_version.c.in
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/tools/monet_version.c.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- monet_version.c.in 8 Nov 2007 19:14:20 -0000 1.3
+++ monet_version.c.in 4 Dec 2007 01:04:28 -0000 1.4
@@ -18,7 +18,7 @@
(size_t) (sizeof(oid) * 8));
printf("Copyright (c) 1993-2007 CWI, all rights reserved\n");
printf("Visit http://monetdb.cwi.nl/ for further information\n");
- printf("Configured for prefix: " MONETDBPREFIX "\n");
+ printf("Configured for prefix: " MONETDB5_PREFIX "\n");
printf("Libraries:\n");
#ifdef HAVE_LIBPCRE
printf(" libpcre: %s (%s)\n", pcre_version(), "@pcreversion@");
-------------------------------------------------------------------------
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-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
