Changeset: 44bfcc5739b6 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=44bfcc5739b6
Modified Files:
configure.ag
Branch: default
Log Message:
Merged from Apr2011
diffs (91 lines):
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -278,6 +278,35 @@
AC_ENABLE_SHARED
AM_CONDITIONAL(CROSS_COMPILING, test x$cross_compiling = xyes)
+dnl logs usually end up in /var/log
+logdir='${localstatedir}/log/monetdb'
+AC_ARG_WITH(logdir,
+ [--with-logdir=DIR Where to put log files
(LOCALSTATEDIR/log/monetdb/)],
+ [case "$withval" in
+ yes|no|auto)
+ AC_MSG_WARN([--with-logdir called without argument -
will use default])
+ ;;
+ *)
+ logdir="$withval"
+ ;;
+ esac]
+)
+
+dnl pidfiles usually end up in /var/run
+rundir='${localstatedir}/run/monetdb'
+AC_ARG_WITH(rundir,
+ [--with-rundir=DIR Where to put pid files
(LOCALSTATEDIR/run/monetdb/)],
+ [case "$withval" in
+ yes|no|auto)
+ AC_MSG_WARN([--with-rundir called without argument -
will use default])
+ ;;
+ *)
+ rundir="$withval"
+ ;;
+ esac]
+)
+
+
dnl checks for programs
AC_LANG([C])
@@ -2930,6 +2959,14 @@
AC_SUBST(Xlocalstatedir)
AC_SUBST(Elocalstatedir)
AC_SUBST(QXlocalstatedir)
+Xlogdir="`$translatepath "$logdir"`"
+eval "Elogdir=${Xlogdir}"
+AC_SUBST(logdir)
+AC_SUBST(Elogdir)
+Xrundir="`$translatepath "$rundir"`"
+eval "Erundir=${Xrundir}"
+AC_SUBST(rundir)
+AC_SUBST(Erundir)
Qlibdir="$libdir"
Xlibdir="`$translatepath "$libdir"`"
QXlibdir="`echo "$Xlibdir" | sed 's/\\\\/\\\\\\\\/g'`"
diff --git a/geom/ChangeLog.Apr2011 b/geom/ChangeLog.Apr2011
--- a/geom/ChangeLog.Apr2011
+++ b/geom/ChangeLog.Apr2011
@@ -1,3 +1,7 @@
# ChangeLog file for geom
# This file is updated with Maddlog
+* Wed Apr 27 2011 Sjoerd Mullender <sjo...@acm.org>
+- Fixed various problems so that now all our tests work correctly on
+ all our testing platforms.
+
diff --git a/tools/merovingian/daemon/.merovingian_properties.in
b/tools/merovingian/daemon/.merovingian_properties.in
--- a/tools/merovingian/daemon/.merovingian_properties.in
+++ b/tools/merovingian/daemon/.merovingian_properties.in
@@ -24,5 +24,5 @@
# is, however, crucial that the file locations in this file are present.
-logfile=@Elocalstatedir@@DIRSEP@log@DIRSEP@monetdb@dir...@merovingian.log
-pidfile=@Elocalstatedir@@DIRSEP@run@DIRSEP@monetdb@dir...@merovingian.pid
+logfile=@Elogdir@@dir...@merovingian.log
+pidfile=@Erundir@@dir...@merovingian.pid
diff --git a/tools/merovingian/daemon/Makefile.ag
b/tools/merovingian/daemon/Makefile.ag
--- a/tools/merovingian/daemon/Makefile.ag
+++ b/tools/merovingian/daemon/Makefile.ag
@@ -17,9 +17,9 @@
man_MANS = monetdbd.1
-monetdb_var_logdir = $(localstatedir)/log/monetdb
+monetdb_var_logdir = $(logdir)
monetdb_var_log_DATA =
-monetdb_var_rundir = $(localstatedir)/run/monetdb
+monetdb_var_rundir = $(rundir)
monetdb_var_run_DATA =
monetdb_var_dbfarmdir = $(localstatedir)/monetdb5/dbfarm
monetdb_var_dbfarm_DATA = .merovingian_properties
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
