Update of /cvsroot/monetdb/MonetDB4/NT
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9900/MonetDB4/NT
Modified Files:
monetdb4_config.h.in
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: monetdb4_config.h.in
===================================================================
RCS file: /cvsroot/monetdb/MonetDB4/NT/monetdb4_config.h.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- monetdb4_config.h.in 12 Jun 2007 17:12:57 -0000 1.6
+++ monetdb4_config.h.in 4 Dec 2007 01:04:26 -0000 1.7
@@ -22,8 +22,8 @@
#include <monetdb_winconfig.h>
-#define MONETDBPREFIX "@Qprefix@"
-#define MONETDBCONFIG "@Qsysconfdir@@[EMAIL PROTECTED]"
+#define MONETDB4_PREFIX "@QXprefix@"
+#define MONETDB4_CONFFILE "@QXsysconfdir@@[EMAIL PROTECTED]"
/* architecture-dependent files */
#define MONETDB4_EXEC_PREFIX "${prefix}"
@@ -34,9 +34,6 @@
/* modifiable single-machine data */
#define MONETDB4_LOCALSTATEDIR "${prefix}\\var"
-/* architecture-independent files */
-#define MONETDB4_PREFIX "@QXprefix@"
-
/* read-only single-machine data */
#define MONETDB4_SYSCONFDIR "${prefix}\\etc"
-------------------------------------------------------------------------
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
