Update of /cvsroot/monetdb/MonetDB5
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9900/MonetDB5
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/MonetDB5/MonetDB-server.spec.in,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- MonetDB-server.spec.in 3 Dec 2007 08:24:45 -0000 1.32
+++ MonetDB-server.spec.in 4 Dec 2007 01:04:27 -0000 1.33
@@ -174,7 +174,6 @@
%dir %{_includedir}/MonetDB5/mal
%dir %{_includedir}/MonetDB5/optimizer
%dir %{_includedir}/MonetDB5/scheduler
-%{_includedir}/MonetDB5/*.h
%{_includedir}/MonetDB5/*/*.[hcm]
%{_libdir}/*.so
--- sysdefs.h.in DELETED ---
Index: configure.ag
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/configure.ag,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- configure.ag 3 Dec 2007 08:24:45 -0000 1.80
+++ configure.ag 4 Dec 2007 01:04:27 -0000 1.81
@@ -157,6 +157,7 @@
AC_DEFINE_UNQUOTED(MONETDB5_LOCALSTATEDIR,"$QXlocalstatedir",[modifiable
single-machine data])
AC_DEFINE_UNQUOTED(MONETDB5_LIBDIR,"$QXlibdir",[object code libraries])
AC_DEFINE_UNQUOTED(MONETDB5_SYSCONFDIR,"$QXsysconfdir",[read-only
single-machine data])
+AC_DEFINE_UNQUOTED(MONETDB5_CONFFILE,"$QXsysconfdir${QDIRSEP}monetdb5.conf",[MonetDB5
config file])
dnl allow to keep track of how we are going to build this thing
Index: Makefile.ag
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/Makefile.ag,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- Makefile.ag 3 Dec 2007 08:24:45 -0000 1.22
+++ Makefile.ag 4 Dec 2007 01:04:26 -0000 1.23
@@ -19,16 +19,10 @@
EXTRA_DIST = bootstrap configure.ag RunMtest.in \
RunMtest.bat.in RunMapprove.in RunMapprove.bat.in \
- RunMserver.in RunMserver.bat.in sysdefs.h.in \
+ RunMserver.in RunMserver.bat.in \
rpm.mk.in MonetDB-server.spec MonetDB-server.spec.in
EXTRA_DIST_DIR = NT tests
-headers_h = {
- HEADERS = h
- SOURCES = mal_config.h sysdefs.h
- DIR = includedir/MonetDB5
-}
-
TESTS = RunMtest
TESTS_ENVIRONMENT = $(SHELL)
-------------------------------------------------------------------------
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
