Changeset: 557099aecb6a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=557099aecb6a
Modified Files:
NT/monetdb_config.h.in
tools/mserver/mserver5.c
Branch: default
Log Message:
Merge heads.
diffs (47 lines):
diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in
--- a/NT/monetdb_config.h.in
+++ b/NT/monetdb_config.h.in
@@ -80,9 +80,6 @@
/* Define if building universal (internal helper macro) */
/* #undef AC_APPLE_UNIVERSAL_BUILD */
-/* location where binaries are installed */
-/* #undef BINDIR */
-
/* read-only architecture-independent data */
#define DATA_DIR PREFIX "\\share"
@@ -95,6 +92,9 @@
/* architecture-dependent files */
#define EXEC_PREFIX PREFIX
+/* location where binaries are installed */
+#define BINDIR EXEC_PREFIX "\\bin"
+
/* Define to nothing if C supports flexible array members, and to 1 if it does
not. That way, with a declaration like `struct s { int n; double
d[FLEXIBLE_ARRAY_MEMBER]; };', the struct hack can be used with pre-C99
diff --git a/tools/mserver/mserver5.c b/tools/mserver/mserver5.c
--- a/tools/mserver/mserver5.c
+++ b/tools/mserver/mserver5.c
@@ -511,7 +511,19 @@ main(int argc, char **av)
* bin/mserver5 -> ../
* libX/monetdb5/lib/
* probe libX = lib, lib32, lib64, lib/64 */
- char *libdirs[] = { "lib", "lib64", "lib/64", "lib32", NULL };
+ size_t pref;
+ /* "remove" common prefix of configured BIN and LIB
+ * directories from LIBDIR */
+ for (pref = 0; LIBDIR[pref] != 0 && BINDIR[pref] ==
LIBDIR[pref]; pref++)
+ ;
+ const char *libdirs[] = {
+ LIBDIR + pref,
+ "lib",
+ "lib64",
+ "lib/64",
+ "lib32",
+ NULL,
+ };
struct stat sb;
if (binpath != NULL) {
char *p = strrchr(binpath, DIR_SEP);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
