Changeset: 62ea6a26e027 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=62ea6a26e027
Modified Files:
common/options/monet_options.mx
Branch: default
Log Message:
monet_options: prepare for removal of monetdb5.conf
- make prefix an implicit member of options, such that expansions of
${prefix} always succeed (gdk_dbfarm uses this now because configure
can't seem to write an expanded path)
- set gdk_dbfarm location to the correct value for it's only consumer
MonetDB5
diffs (24 lines):
diff --git a/common/options/monet_options.mx b/common/options/monet_options.mx
--- a/common/options/monet_options.mx
+++ b/common/options/monet_options.mx
@@ -200,7 +200,10 @@
char *p, *t;
*r = 0;
- p = mo_find_option(set, setlen, q + 2);
+ if (strcmp(q + 2, "prefix") == 0)
+ p = PREFIX;
+ else
+ p = mo_find_option(set, setlen, q + 2);
if (!p) {
*r = '}';
return s;
@@ -378,7 +381,7 @@
set[i].kind = opt_builtin;
set[i].name = strdup("gdk_dbfarm");
snprintf(buf, BUFSIZ, "%s%c%s%c%s",
- LOCALSTATEDIR, DIR_SEP, PACKAGE, DIR_SEP, "dbfarm");
+ LOCALSTATEDIR, DIR_SEP, "monetdb5", DIR_SEP, "dbfarm");
set[i].value = strdup(buf);
i++;
set[i].kind = opt_builtin;
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
