Update of /cvsroot/monetdb/sql/NT
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv14068/NT
Modified Files:
Makefile
Log Message:
propagated changes of Monday Jun 23 2008 - Tuesday Jun 24 2008
from the SQL_2-24 branch to the development trunk
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/23 - sjoerd: RunMserver.bat.in,1.8.4.1 NT/Makefile,1.25.2.1
Cleanup.
M5 is default if present, else M4 is default.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/23 - sjoerd: NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj,1.19.2.7
NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj,1.9.2.7
Register installation path.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/24 - sjoerd: NT/MonetDB4-SQL/MonetDB4-SQL-Installer.vdproj,1.11.2.7
NT/MonetDB4-SQL64/MonetDB4-SQL-Installer.vdproj,1.6.2.8
NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj,1.19.2.8
NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj,1.9.2.8
Updated version number.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: Makefile
===================================================================
RCS file: /cvsroot/monetdb/sql/NT/Makefile,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- Makefile 23 May 2008 07:32:58 -0000 1.25
+++ Makefile 24 Jun 2008 07:59:42 -0000 1.26
@@ -18,6 +18,12 @@
IBITS = 64
!ENDIF
+!IFDEF HAVE_MONETDB4
+M4INSTALLER = install-m4installer
+!ELSE
+M4INSTALLER =
+!ENDIF
+
!IFDEF HAVE_MONETDB5
RUNMSERVER5 = RunMserver5.bat
M5INSTALLER = install-m5installer
@@ -26,13 +32,7 @@
M5INSTALLER =
!ENDIF
-!IFDEF HAVE_MONETDB5
-M4INSTALLER = install-m4installer
-!ELSE
-M4INSTALLER =
-!ENDIF
-
-all: "$(SRCDIR)\Makefile.msc" all-msc unistd.h RunMserver.bat RunMtest.bat
RunMapprove.bat $(RUNMSERVER5)
+all: "$(SRCDIR)\Makefile.msc" all-msc unistd.h RunMserver.bat $(RUNMSERVER5)
RunMtest.bat RunMapprove.bat
$(MAKE) /nologo /f "$(SRCDIR)\Makefile.msc" "prefix=$(prefix)"
"bits=$(bits)" all
check: "$(SRCDIR)\Makefile.msc" RunMtest.bat
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
