Update of /cvsroot/monetdb/geom
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv18194

Modified Files:
        MonetDB-geom.spec.in README RunMapprove.bat.in RunMapprove.in 
        RunMserver.bat.in RunMtest.bat.in RunMtest.in configure.ag 
        rpm.mk.in vertoo.config vertoo.data 
Log Message:

Reviving MonetDB4 support for the "Geom(etry)" module.

When MonetDB4 support for SQL had been discontinued some weeks ago,
I was too eager to also discontinue MonetDB4 support the "Geom(etry)" module,
assuming it was only used together with SQL.
However, it appears, now, that Geom is also (to be?) used together with XQuery,
and hence still requires MonetDB4 support.

Basically, this check-in reverts most of the changes between CVS tags
"with_MonetDB4" & "implicit_MonetDB5", only the obsolete "RunMserver5.bat.in"
script and MonetDB4-specific files of the (SQL-based) tests are not revived.

For convenience, these changes are wrapped in CVS tags
"before_reviving_MonetDB4_support" & "after_reviving_MonetDB4_support".


U RunMserver.bat.in
Index: RunMserver.bat.in
===================================================================
RCS file: /cvsroot/monetdb/geom/RunMserver.bat.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- RunMserver.bat.in   29 Oct 2008 23:05:52 -0000      1.5
+++ RunMserver.bat.in   15 Dec 2008 14:11:51 -0000      1.6
@@ -2,20 +2,31 @@
 
 setlocal
 
+rem if both M4 & M5 are available, M5 is default;
+rem otherwise, the available one is default
+if "@HAVE_MONETDB4_FALSE@" == "#" set V=4
+if "@HAVE_MONETDB5_FALSE@" == "#" set V=5
+rem commandline option overrules default
+if "%1" == "-4" set V=4& shift
+if "%1" == "-5" set V=5& shift
+
+set monetdb4_pref...@xmonetdb4_prefix@
 set monetdb5_pref...@xmonetdb5_prefix@
 set sql_pref...@xsql_prefix@
 
-call "%monetdb5_prefix%\bin\monetdb5-config.bat" --internal
+if %V% == 4 call "%monetdb4_prefix%\bin\monetdb4-config.bat" --internal
+if %V% == 5 call "%monetdb5_prefix%\bin\monetdb5-config.bat" --internal
 call "%sql_prefix%\bin\monetdb-sql-config.bat" --internal
 
 set buildd...@geom_build@
 
 set MOD_PATH=%modpath%
-set MOD_PATH=%modpath5%;%MOD_PATH%
+if %V% == 4 set MOD_PATH=%modpath4%;%MOD_PATH%
+if %V% == 5 set MOD_PATH=%modpath5%;%MOD_PATH%
 
 set MOD_PATH=%builddir%\src\sql;%MOD_PATH%
-set MOD_PATH=%builddir%\src\monetdb5;%MOD_PATH%
-set MOD_PATH=%builddir%\src\monetdb5\.libs;%MOD_PATH%
+set MOD_PATH=%builddir%\src\monetdb%V%;%MOD_PATH%
+set MOD_PATH=%builddir%\src\monetdb%V%\.libs;%MOD_PATH%
 
 set PATH=%MOD_PATH%;%PATH%
 set PATH=%builddir%\conf;%PATH%
@@ -23,6 +34,9 @@
 rem to find geos_c.dll
 set PATH=%GEOS%\bin;%PATH%
 
-mserver5.exe --set "monet_mod_path=%MOD_PATH%" %1 %2 %3 %4 %5 %6 %7 %8 %9
+if %V% == 4 set mserver=Mserver.exe
+if %V% == 5 set mserver=mserver5.exe
+
+%mserver% --set "monet_mod_path=%MOD_PATH%" %1 %2 %3 %4 %5 %6 %7 %8 %9
 
 endlocal

U MonetDB-geom.spec.in
Index: MonetDB-geom.spec.in
===================================================================
RCS file: /cvsroot/monetdb/geom/MonetDB-geom.spec.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- MonetDB-geom.spec.in        4 Nov 2008 23:35:59 -0000       1.10
+++ MonetDB-geom.spec.in        15 Dec 2008 14:11:51 -0000      1.11
@@ -27,6 +27,8 @@
 Source: http://downloads.sourceforge.net/monetdb/MonetDB-geom-%{version}.tar.gz
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
+%{!?_with_monetdb4: %{!?_without_monetdb4: %define _without_monetdb4 
--without-monetdb4}}
+%{!?_with_monetdb5: %{!?_without_monetdb5: %define _with_monetdb5 
--with-monetdb5}}
 
 %if !%{?buildsystem}
 BuildRequires: MonetDB-devel >= 1.26
@@ -45,6 +47,33 @@
 This package contains the common parts of the GIS (Geographic
 Information System) extensions for MonetDB-SQL.
 
+%if %{?_with_monetdb4:1}%{!?_with_monetdb4:0}
+%package MonetDB4
+Summary: MonetDB4 SQL GIS modules
+Group: Applications/Databases
+Requires: MonetDB4-server >= 4.26
+#                            ^^^^
+# Maintained via vertoo. Please don't modify by hand!
+# Contact [email protected] for details and/or 
assistance.
+%if !%{?buildsystem}
+BuildRequires: MonetDB4-server-devel >= 4.26
+#                                       ^^^^
+# Maintained via vertoo. Please don't modify by hand!
+# Contact [email protected] for details and/or 
assistance.
+%endif
+
+%description MonetDB4
+MonetDB is a database management system that is developed from a
+main-memory perspective with use of a fully decomposed storage model,
+automaticautomatic index management, extensibility of data types and search
+accelerators, SQL- and XML- frontends.
+
+This package contains the GIS (Geographic Information System)
+extensions for MonetDB-SQL-server4.
+
+%endif
+
+%if %{?_with_monetdb5:1}%{!?_with_monetdb5:0}
 %package MonetDB5
 Summary: MonetDB5 SQL GIS modules
 Group: Applications/Databases
@@ -68,12 +97,15 @@
 This package contains the GIS (Geographic Information System)
 extensions for MonetDB-SQL-server5.
 
+%endif
 
 %package devel
 Summary: MonetDB SQL GIS development package
 Group: Applications/Databases
+%if %{?_with_monetdb5:1}%{!?_with_monetdb5:0}
 Requires: %{name}-MonetDB5
 Requires: MonetDB5-server-devel
+%endif
 Requires: MonetDB-devel
 Requires: geos-devel
 
@@ -85,6 +117,27 @@
 
 This package contains the files needed to develop with %{name}.
 
+%if %{?_with_monetdb4:1}%{!?_with_monetdb4:0}
+%package devel4
+Summary: MonetDB SQL GIS development package
+Group: Applications/Databases
+%if %{?_with_monetdb4:1}%{!?_with_monetdb4:0}
+Requires: %{name}-MonetDB4
+Requires: MonetDB4-server-devel
+%endif
+Requires: %{name}-devel
+Requires: MonetDB-devel
+Requires: geos-devel
+
+%description devel4
+MonetDB is a database management system that is developed from a
+main-memory perspective with use of a fully decomposed storage model,
+automatic index management, extensibility of data types and search
+accelerators, SQL- and XML- frontends.
+
+This package contains the files needed to develop with %{name}.
+%endif
+
 %prep
 rm -rf $RPM_BUILD_ROOT
 
@@ -100,7 +153,9 @@
        --enable-bits=%{bits} \
        %{?oid32:--enable-oid32} \
        %{?comp_cc:CC="%{comp_cc}"} \
-       --with-monetdb=%{_prefix}
+       --with-monetdb=%{_prefix} \
+       %{?_with_monetdb4} %{?_without_monetdb4} \
+       %{?_with_monetdb5} %{?_without_monetdb5}
 
 make
 
@@ -118,13 +173,27 @@
 %files
 %defattr(-,root,root)
 %{_datadir}/MonetDB/sql/geom.sql
+%if %{?_with_monetdb4:1}%{!?_with_monetdb4:0}
+%files MonetDB4
+%{_libdir}/MonetDB4/lib/lib_geom.so.*
+%{_libdir}/MonetDB4/geom.mil
+%endif
+%if %{?_with_monetdb5:1}%{!?_with_monetdb5:0}
 %files MonetDB5
 %{_libdir}/MonetDB5/lib/lib_geom.so.*
 %{_libdir}/MonetDB5/geom.mal
+%endif
 
 %files devel
 %{_bindir}/monetdb-geom-config
+%if %{?_with_monetdb5:1}%{!?_with_monetdb5:0}
 %{_libdir}/MonetDB5/lib/lib_geom.so
+%endif
+
+%if %{?_with_monetdb4:1}%{!?_with_monetdb4:0}
+%files devel4
+%{_libdir}/MonetDB4/lib/lib_geom.so
+%endif
 
 %changelog
 * Tue May 27 2008 Sjoerd Mullender <[email protected]> - @vers...@-1

U vertoo.data
Index: vertoo.data
===================================================================
RCS file: /cvsroot/monetdb/geom/vertoo.data,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- vertoo.data 4 Nov 2008 23:35:59 -0000       1.12
+++ vertoo.data 15 Dec 2008 14:11:51 -0000      1.13
@@ -1,3 +1,4 @@
 monetdb = major:1; minor:26; release:0; rc:x; build:1;
+monetdb4 = major:4; minor:26; release:0; rc:x; build:1;
 monetdb5 = major:5; minor:8; release:0; rc:x; build:1;
 geom = major:0; minor:7; release:0; rc:x; build:1;
\ No newline at end of file

U README
Index: README
===================================================================
RCS file: /cvsroot/monetdb/geom/README,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- README      29 Oct 2008 18:51:59 -0000      1.2
+++ README      15 Dec 2008 14:11:51 -0000      1.3
@@ -1,13 +1,13 @@
 
 This "geom" directory contains the nessesary configure files and scripts
-to build a simple example module (src/monetdb5/geom.mx) for the MonetDB 
database
+to build a simple example module (src/monetdb[45]/geom.mx) for the MonetDB 
database
 engine.
 
 
 Prerequisites
 =============
 
-Before compiling the "geom" module, make sure you have version 5.6 (or
+Before compiling the "geom" module, make sure you have version 4.26 (or
 newer) of MonetDB installed, and "monetdb-config" is reachable via your
 $PATH.
 See http://monetdb.cwi.nl/ for details.
@@ -15,7 +15,7 @@
 Further, make sure that you also have the "buildtools" installed, and
 "autogen.py", "Mx" and "mel" are reachable via your $PATH.
 You can get the "buildtools" via
-       cvs -d:pserver:[email protected]:/cvsroot/monetdb 
checkout -P -rMonetDB_1-24 buildtools
+       cvs -d:pserver:[email protected]:/cvsroot/monetdb 
checkout -P -rMonetDB_4-26 buildtools
 See the buildtools' README file for more details.
 
 

U RunMtest.in
Index: RunMtest.in
===================================================================
RCS file: /cvsroot/monetdb/geom/RunMtest.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- RunMtest.in 29 Oct 2008 23:05:52 -0000      1.13
+++ RunMtest.in 15 Dec 2008 14:11:51 -0000      1.14
@@ -23,13 +23,26 @@
 srcdir=`cd '@srcdir@'; pwd`
 uname=`uname`
 
+# if both M4 & M5 are available, M5 is default;
+# otherwise, the available one is default
+...@have_monetdb4_true@V=4
+...@have_monetdb5_true@V=5
+# commandline option overrules default
+for arg
+do
+    case "$arg" in
+    -4) V=4;;
+    -5) V=5;;
+    esac
+done
+
 # where compiled modules are to be found
-for d in src/monetdb5
+for d in src/monetdb$V
 do
        MOD_PATH="${MOD_PATH}${builddir}/$d/.libs:${builddir}/$d:"
 done
-MOD_PATH="${MOD_PATH}`monetdb5-config --modpath`"
-MOD_PATH="${MOD_PATH}:`monetdb-sql-config --modpath5`"
+MOD_PATH="${MOD_PATH}`monetdb$V-config --modpath`"
+MOD_PATH="${MOD_PATH}:`monetdb-sql-config --modpath$V`"
 
 # make sure scripts are executable
 for x in "${builddir}/conf/${pkg}-config"
@@ -75,4 +88,4 @@
 # arguments.
 # if the environment variable MTEST_AT is set (value does not matter), pass
 # the --at flag to Mtest.py so that it uses the at command as a watchdog.
-exec Mtest.py --package=${pkg} --monet_mod_path="${MOD_PATH}" 
--dbfarm="${builddir}/dbfarm" --sql_logdir="${builddir}/sql_logs" 
--xquery_logdir="${builddir}/xquery_logs" --TSTTRGBASE="${builddir}" 
${MTEST_AT+--at} "$...@--rq}"
+exec Mtest.py -$V --package=${pkg} --monet_mod_path="${MOD_PATH}" 
--dbfarm="${builddir}/dbfarm" --sql_logdir="${builddir}/sql_logs" 
--xquery_logdir="${builddir}/xquery_logs" --TSTTRGBASE="${builddir}" 
${MTEST_AT+--at} "$...@--rq}"

U RunMtest.bat.in
Index: RunMtest.bat.in
===================================================================
RCS file: /cvsroot/monetdb/geom/RunMtest.bat.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- RunMtest.bat.in     29 Oct 2008 23:05:52 -0000      1.6
+++ RunMtest.bat.in     15 Dec 2008 14:11:51 -0000      1.7
@@ -8,10 +8,20 @@
 
 setlocal
 
+rem if both M4 & M5 are available, M5 is default;
+rem otherwise, the available one is default
+if "@HAVE_MONETDB4_FALSE@" == "#" set V=4
+if "@HAVE_MONETDB5_FALSE@" == "#" set V=5
+rem commandline option overrules default
+if "%1" == "-4" set V=4& shift
+if "%1" == "-5" set V=5& shift
+
+set monetdb4_pref...@xmonetdb4_prefix@
 set monetdb5_pref...@xmonetdb5_prefix@
 set sql_pref...@xsql_prefix@
 
-call "%monetdb5_prefix%\bin\monetdb5-config.bat" --internal
+if %V% == 4 call "%monetdb4_prefix%\bin\monetdb4-config.bat" --internal
+if %V% == 5 call "%monetdb5_prefix%\bin\monetdb5-config.bat" --internal
 call "%sql_prefix%\bin\monetdb-sql-config.bat" --internal
 
 set pkg=monetdb-geom
@@ -19,11 +29,12 @@
 set srcd...@xgeom_source@
 
 set MOD_PATH=%modpath%
-set MOD_PATH=%modpath5%;%MOD_PATH%
+if %V% == 4 set MOD_PATH=%modpath4%;%MOD_PATH%
+if %V% == 5 set MOD_PATH=%modpath5%;%MOD_PATH%
 
 set MOD_PATH=%builddir%\src\sql;%MOD_PATH%
-set MOD_PATH=%builddir%\src\monetdb5;%MOD_PATH%
-set MOD_PATH=%builddir%\src\monetdb5\.libs;%MOD_PATH%
+set MOD_PATH=%builddir%\src\monetdb%V%;%MOD_PATH%
+set MOD_PATH=%builddir%\src\monetdb%V%\.libs;%MOD_PATH%
 
 set PATH=%MOD_PATH%;%PATH%
 set PATH=%builddir%\conf;%PATH%
@@ -34,7 +45,7 @@
 REM execute Mtest.py in the source directory
 pushd %srcdir%
 
-call Mtest.py "--package=%pkg%" "--monet_mod_path=%MOD_PATH%" 
"--dbfarm=%builddir%\dbfarm" "--sql_logdir=%builddir%\sql_logs" 
"--xquery_logdir=%builddir%\xquery_logs" "--TSTTRGBASE=%builddir%" %1 %2 %3 %4 
%5 %6 %7 %8 %9
+call Mtest.py -%V% "--package=%pkg%" "--monet_mod_path=%MOD_PATH%" 
"--dbfarm=%builddir%\dbfarm" "--sql_logdir=%builddir%\sql_logs" 
"--xquery_logdir=%builddir%\xquery_logs" "--TSTTRGBASE=%builddir%" %1 %2 %3 %4 
%5 %6 %7 %8 %9
 
 popd
 endlocal

U configure.ag
Index: configure.ag
===================================================================
RCS file: /cvsroot/monetdb/geom/configure.ag,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- configure.ag        4 Nov 2008 23:35:59 -0000       1.24
+++ configure.ag        15 Dec 2008 14:11:51 -0000      1.25
@@ -67,17 +67,29 @@
 AM_MONETDB_OPTIONS()
 AM_MONETDB_LIBS()
 AM_MONETDB_UTILS()
+req_monetdb4_ver='4.26.0'
+#                 ^^^^^^
+# Maintained via vertoo. Please don't modify by hand!
+# Contact [email protected] for details and/or 
assistance.
+AM_MONETDB4($req_monetdb4_ver)
 req_monetdb5_ver='5.8.0'
 #                 ^^^^^
 # Maintained via vertoo. Please don't modify by hand!
 # Contact [email protected] for details and/or 
assistance.
 AM_MONETDB5($req_monetdb5_ver)
 
-if test "x$have_monetdb5" != xyes; then
-       if test "x$MONETDB5_VERSION" = "x"; then
-               MONETDB5_VERSION='none'
+if test "x$have_monetdb4" != xyes -a "x$have_monetdb5" != xyes; then
+       if test "x$MONETDB4_VERSION" = "x" -a "x$MONETDB5_VERSION" = "x"; then
+               AC_MSG_ERROR([Neither MonetDB4 nor MonetDB5 was not found. 
MonetDB/SQL requires at least version $req_monetdb4_ver of MonetDB4 or version 
$req_monetdb5_ver of MonetDB5.])
+       else
+               if test "x$MONETDB4_VERSION" = "x"; then
+                       MONETDB4_VERSION='none'
+               fi
+               if test "x$MONETDB5_VERSION" = "x"; then
+                       MONETDB5_VERSION='none'
+               fi
+               AC_MSG_ERROR([MonetDB/SQL requires at least version 
$req_monetdb4_ver of MonetDB4 (found $MONETDB4_VERSION) or version 
$req_monetdb5_ver of MonetDB5 (found $MONETDB5_VERSION).])
        fi
-       AC_MSG_ERROR([MonetDB/SQL requires at least version $req_monetdb5_ver 
of MonetDB5 (found $MONETDB5_VERSION).])
 fi
 
 dnl geos

U vertoo.config
Index: vertoo.config
===================================================================
RCS file: /cvsroot/monetdb/geom/vertoo.config,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- vertoo.config       29 Oct 2008 18:51:59 -0000      1.6
+++ vertoo.config       15 Dec 2008 14:11:51 -0000      1.7
@@ -3,6 +3,7 @@
 
 main = addModule('geom')
 monetdb = addModule('MonetDB')
+monetdb4 = addModule('MonetDB4')
 monetdb5 = addModule('MonetDB5')
 
 # %v - unadorned version number
@@ -19,6 +20,14 @@
                    arguments(pattern = "\nBuildRequires: MonetDB-devel >= %v",
                              format = "%major.%minor"))
 
+monetdb4.setVersionFormat('@normal%[rc?%rc%build:]')
+monetdb4.addAnchor("configure.ag", "req_monetdb4_ver=%q")
+monetdb4.addAnchors("MonetDB-geom.spec.in",
+                    arguments(pattern = "\nRequires: MonetDB4-server >= %v",
+                              format = "%major.%minor"),
+                    arguments(pattern = "\nBuildRequires: 
MonetDB4-server-devel >= %v",
+                              format = "%major.%minor"))
+
 monetdb5.setVersionFormat('@normal%[rc?%rc%build:]')
 monetdb5.addAnchor("configure.ag", "req_monetdb5_ver=%q")
 monetdb5.addAnchors("MonetDB-geom.spec.in",

U RunMapprove.in
Index: RunMapprove.in
===================================================================
RCS file: /cvsroot/monetdb/geom/RunMapprove.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- RunMapprove.in      29 Oct 2008 23:05:52 -0000      1.6
+++ RunMapprove.in      15 Dec 2008 14:11:51 -0000      1.7
@@ -22,6 +22,16 @@
 # make sure srcdir contains absolute path name
 srcdir=`cd '@srcdir@'; pwd`
 
+# default back-end is MonetDB5
+V=5
+for arg
+do
+    case "$arg" in
+    -4) V=4;;
+    -5) V=5;;
+    esac
+done
+
 # enhance PATH to find ${pkg}-config
 PATH="${builddir}/conf:$PATH"
 export PATH
@@ -32,4 +42,4 @@
 # execute the script.
 # if no arguments, do a recursive approve (Mapprove.py -r), else pass
 # on the arguments
-exec Mapprove.py --package=${pkg} --TSTTRGBASE="${builddir}" "$...@--r}"
+exec Mapprove.py -$V --package=${pkg} --TSTTRGBASE="${builddir}" "$...@--r}"

U RunMapprove.bat.in
Index: RunMapprove.bat.in
===================================================================
RCS file: /cvsroot/monetdb/geom/RunMapprove.bat.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- RunMapprove.bat.in  29 Oct 2008 23:05:52 -0000      1.4
+++ RunMapprove.bat.in  15 Dec 2008 14:11:51 -0000      1.5
@@ -8,6 +8,11 @@
 
 setlocal
 
+rem default back end is MonetDB5
+set V=5
+if "%1" == "-4" set V=4& shift
+if "%1" == "-5" set V=5& shift
+
 set pkg=monetdb-sql
 set buildd...@xgeom_build@
 set srcd...@xgeom_source@
@@ -17,7 +22,7 @@
 REM execute Mapprove.py in the source directory
 pushd %srcdir%
 
-call Mapprove.py "--package=%pkg%" "--TSTTRGBASE=%builddir%" %1 %2 %3 %4 %5 %6 
%7 %8 %9
+call Mapprove.py -%V% "--package=%pkg%" "--TSTTRGBASE=%builddir%" %1 %2 %3 %4 
%5 %6 %7 %8 %9
 
 popd
 endlocal

U rpm.mk.in
Index: rpm.mk.in
===================================================================
RCS file: /cvsroot/monetdb/geom/rpm.mk.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- rpm.mk.in   14 Nov 2008 14:37:27 -0000      1.8
+++ rpm.mk.in   15 Dec 2008 14:11:51 -0000      1.9
@@ -21,6 +21,11 @@
 
 rpmmacros = `rpmbuild --showrc | sed -n 's/macrofiles *: 
*//p'`:$(rpmtopdir)/rpmmacros
 
+...@have_monetdb4_false@monetdb4=--without monetdb4
+...@have_monetdb4_true@monetdb4=--with monetdb4
+...@have_monetdb5_false@monetdb5=--without monetdb5
+...@have_monetdb5_true@monetdb5=--with monetdb5
+
 $(top_builddir)/$(distdir).tar.gz:
        $(MAKE) $(AM_MAKEFLAGS) dist
 
@@ -43,14 +48,14 @@
        if test "@oids@" -eq 32; then echo "%oid32 1" >> 
$(rpmtopdir)/rpmmacros; fi
 
 rpm:   MonetDB-geom.spec $(top_builddir)/$(distdir).tar.gz 
$(rpmtopdir)/rpmmacros
-       $(RPMBUILD) --macros "$(rpmmacros)" --rcfile $(rpmtopdir)/rpmrc -ta 
--target `uname -m` --define="buildsystem 1" --define="comp_cc @CC@" 
$(top_builddir)/$(distdir).tar.gz
+       $(RPMBUILD) --macros "$(rpmmacros)" --rcfile $(rpmtopdir)/rpmrc -ta 
--target `uname -m` ${monetdb4} ${monetdb5} --define="buildsystem 1" 
--define="comp_cc @CC@" $(top_builddir)/$(distdir).tar.gz
        for i in $(rpmtopdir)/SRPMS/*...@linux_dist@....@oids@* ; do \
                mv "$$i" "`echo "$$i" | sed 's|_...@linux_dist@....@oids@||'`" 
; \
        done
        rm -rf $(rpmtopdir)/BUILD
 
 srpm:  MonetDB-geom.spec $(top_builddir)/$(distdir).tar.gz 
$(rpmtopdir)/rpmmacros
-       $(RPMBUILD) --macros "$(rpmmacros)" --rcfile $(rpmtopdir)/rpmrc -ts 
--define="buildsystem 1" $(top_builddir)/$(distdir).tar.gz
+       $(RPMBUILD) --macros "$(rpmmacros)" --rcfile $(rpmtopdir)/rpmrc -ts 
${monetdb4} ${monetdb5} --define="buildsystem 1" 
$(top_builddir)/$(distdir).tar.gz
        for i in $(rpmtopdir)/SRPMS/*...@linux_dist@....@oids@* ; do \
                mv "$$i" "`echo "$$i" | sed 's|_...@linux_dist@....@oids@||'`" 
; \
        done


------------------------------------------------------------------------------
SF.Net email is Sponsored by MIX09, March 18-20, 2009 in Las Vegas, Nevada.
The future of the web can't happen without you.  Join us at MIX09 to help
pave the way to the Next Web now. Learn more and register at
http://ad.doubleclick.net/clk;208669438;13503038;i?http://2009.visitmix.com/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins

Reply via email to