[prev in list] [next in list] [prev in thread] [next in thread] 

List:       monetdb-sql-checkins
Subject:    [Monetdb-sql-checkins] sql/NT Makefile,SQL_2-24,1.25,1.25.2.1
From:       Sjoerd Mullender <sjoerd () users ! sourceforge ! net>
Date:       2008-06-23 15:47:19
Message-ID: E1KAoGG-0008U4-Od () mail ! sourceforge ! net
[Download RAW message or body]

Update of /cvsroot/monetdb/sql/NT
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv17871/NT

Modified Files:
      Tag: SQL_2-24
	Makefile 
Log Message:
Cleanup.
M5 is default if present, else M4 is default.

U Makefile
Index: Makefile
===================================================================
RCS file: /cvsroot/monetdb/sql/NT/Makefile,v
retrieving revision 1.25
retrieving revision 1.25.2.1
diff -u -d -r1.25 -r1.25.2.1
--- Makefile	23 May 2008 07:32:58 -0000	1.25
+++ Makefile	23 Jun 2008 15:47:17 -0000	1.25.2.1
@@ -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
Monetdb-sql-checkins@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins


[prev in list] [next in list] [prev in thread] [next in thread]