Update of /cvsroot/monetdb/MonetDB4
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9900/MonetDB4
Modified Files:
Makefile.ag MonetDB-server.spec.in configure.ag
Removed Files:
sysdefs.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: MonetDB-server.spec.in
===================================================================
RCS file: /cvsroot/monetdb/MonetDB4/MonetDB-server.spec.in,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- MonetDB-server.spec.in 3 Dec 2007 08:24:35 -0000 1.20
+++ MonetDB-server.spec.in 4 Dec 2007 01:04:25 -0000 1.21
@@ -173,7 +173,6 @@
%{_bindir}/calibrator
%{_libdir}/pkgconfig/MonetDB.pc
%dir %{_includedir}/MonetDB4
-%{_includedir}/MonetDB4/*.h
%{_includedir}/MonetDB4/*/*.[hcm]
%{_libdir}/libmonet.so
%{_libdir}/libembeddedmil.so
--- sysdefs.h.in DELETED ---
Index: configure.ag
===================================================================
RCS file: /cvsroot/monetdb/MonetDB4/configure.ag,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- configure.ag 3 Dec 2007 08:24:35 -0000 1.25
+++ configure.ag 4 Dec 2007 01:04:25 -0000 1.26
@@ -105,6 +105,7 @@
AC_DEFINE_UNQUOTED(MONETDB4_LOCALSTATEDIR,"$QXlocalstatedir",[modifiable
single-machine data])
AC_DEFINE_UNQUOTED(MONETDB4_LIBDIR,"$QXlibdir",[object code libraries])
AC_DEFINE_UNQUOTED(MONETDB4_SYSCONFDIR,"$QXsysconfdir",[read-only
single-machine data])
+AC_DEFINE_UNQUOTED(MONETDB4_CONFFILE,"$QXsysconfdir${QDIRSEP}MonetDB.conf",[MonetDB4
config file])
dnl AC_CHECK_PROG(CP,cp,cp -f)
Index: Makefile.ag
===================================================================
RCS file: /cvsroot/monetdb/MonetDB4/Makefile.ag,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Makefile.ag 3 Dec 2007 08:24:35 -0000 1.9
+++ Makefile.ag 4 Dec 2007 01:04:25 -0000 1.10
@@ -19,19 +19,12 @@
EXTRA_DIST = bootstrap configure.ag RunMtest.in \
RunMtest.bat.in RunMapprove.in RunMapprove.bat.in \
RunMserver.bat.in RunMserver.in \
- sysdefs.h.in \
rpm.mk.in MonetDB-server.spec MonetDB-server.spec.in \
HowToStart HowToStart-MinGW.txt \
HowToStart-MinGW-pcre.txt HowToStart-MinGW-swig.txt
EXTRA_DIST_DIR = NT tests
-headers_h = {
- HEADERS = h
- SOURCES = monetdb4_config.h sysdefs.h
- DIR = includedir/MonetDB4
-}
-
headers_pc = {
HEADERS = pc
SOURCES = MonetDB.pc.in
-------------------------------------------------------------------------
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
