Update of /cvsroot/monetdb/MonetDB5/conf
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv2308/conf
Modified Files:
Makefile.ag monetdb5-config.bat.in monetdb5-config.in
monetdb5.conf.in
Log Message:
Changed the name of the generated tar balls (and the name of the
top-level directory within them).
The names are now equal to what nightly testing created, so that
doesn't have to rename the tar balls anymore.
The files are still installed in the same place as before.
Building RPMs still works.
The main change in the code is that we no longer use @PACKAGE@ since
that is the longer tar ball name which we don't want in the
installation directories we create. Also, we can't use the defaults
when installing include files since they would also otherwise be
installed in a directory with @PACKAGE@ in it.
Note, this will undoubtedly negatively affect the monetdb-install
script, but I leave it to its owner to fix that.
Index: Makefile.ag
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/conf/Makefile.ag,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- Makefile.ag 24 Nov 2007 14:34:42 -0000 1.12
+++ Makefile.ag 3 Dec 2007 08:24:46 -0000 1.13
@@ -43,5 +43,5 @@
monetdb_var_log_DATA =
monetdb_var_rundir = $(localstatedir)/run
monetdb_var_run_DATA =
-monetdb_var_dbfarmdir = $(localstatedir)/$(PACKAGE)/dbfarm
+monetdb_var_dbfarmdir = $(localstatedir)/MonetDB5/dbfarm
monetdb_var_dbfarm_DATA =
Index: monetdb5-config.in
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/conf/monetdb5-config.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- monetdb5-config.in 3 Oct 2007 14:00:44 -0000 1.2
+++ monetdb5-config.in 3 Dec 2007 08:24:46 -0000 1.3
@@ -16,7 +16,7 @@
# Portions created by CWI are Copyright (C) 1997-2007 CWI.
# All Rights Reserved.
-pkg="@PACKAGE@"
+pkg="MonetDB5"
source="@QMONETDB5_SOURCE@"
build="@QMONETDB5_BUILD@"
prefix="@Qprefix@"
Index: monetdb5-config.bat.in
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/conf/monetdb5-config.bat.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- monetdb5-config.bat.in 3 Oct 2007 14:00:41 -0000 1.2
+++ monetdb5-config.bat.in 3 Dec 2007 08:24:46 -0000 1.3
@@ -3,7 +3,7 @@
REM set prefix=%~dp0
REM set prefix=%prefix:~0,-4%
-set [EMAIL PROTECTED]@
+set pkg=MonetDB5
set [EMAIL PROTECTED]@
set [EMAIL PROTECTED]@
set [EMAIL PROTECTED]@
Index: monetdb5.conf.in
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/conf/monetdb5.conf.in,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- monetdb5.conf.in 25 Nov 2007 09:50:25 -0000 1.28
+++ monetdb5.conf.in 3 Dec 2007 08:24:46 -0000 1.29
@@ -20,7 +20,7 @@
# All databases are stored as a directory under the directory
# given below. Use this value to change the overall location
# of your data.
[EMAIL PROTECTED]@@DIRSEP@@PACKAGE@@[EMAIL PROTECTED]
[EMAIL PROTECTED]@@[EMAIL PROTECTED]@[EMAIL PROTECTED]
# MonetDB can only handle one database at a time. When you start an
# mserver5 manually without specifying the database name yourself, the
@@ -104,7 +104,7 @@
# Prompt when using MAL interface
# monet_prompt=>
# Where do the MonetDB modules reside? The second path is for windows dlls.
[EMAIL PROTECTED]@@DIRSEP@@PACKAGE@@PATHSEP@@libdir@@DIRSEP@@PACKAGE@@[EMAIL
PROTECTED]@PATHSEP@@libdir@@DIRSEP@@PACKAGE@@[EMAIL PROTECTED]
[EMAIL PROTECTED]@@[EMAIL PROTECTED]@PATHSEP@@libdir@@[EMAIL PROTECTED]@[EMAIL
PROTECTED]@PATHSEP@@libdir@@[EMAIL PROTECTED]@[EMAIL PROTECTED]
# Start mserver in daemon mode, or start with MAL interactive interface?
monet_daemon=no
# Display version and copyright information upon startup?
@@ -170,7 +170,7 @@
# MAL section
# Monet Virtual Machine
#====================================
[EMAIL PROTECTED]@@DIRSEP@@PACKAGE@/mal_init.mal
[EMAIL PROTECTED]@@[EMAIL PROTECTED]/mal_init.mal
mal_listing = 15 # List everything
# 1 = List the original input
# 2 = List the MAL instruction
@@ -182,7 +182,7 @@
# Checkpoints are stored in their own area, preferrably
# on a different storage device. Checkpoints should be
# initialized manually.
[EMAIL PROTECTED]@@DIRSEP@@PACKAGE@@[EMAIL PROTECTED]
[EMAIL PROTECTED]@@[EMAIL PROTECTED]@[EMAIL PROTECTED]
# Monet Application Interface Section
#====================================
@@ -198,9 +198,9 @@
# Place to store transaction logs
# The logs are typically stored on a different storage medium
# to protect the database against accidental hardware loss.
[EMAIL PROTECTED]@@DIRSEP@@PACKAGE@@[EMAIL PROTECTED]
[EMAIL PROTECTED]@@[EMAIL PROTECTED]@[EMAIL PROTECTED]
# The sql_init is a comma separated list of sql files to be
# executed upon system restart. It is primarily used to make
# SQL library functions known to all users.
[EMAIL PROTECTED]@@DIRSEP@@PACKAGE@/sql_init.sql
[EMAIL PROTECTED]@@[EMAIL PROTECTED]/sql_init.sql
-------------------------------------------------------------------------
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
