Update of /cvsroot/monetdb/sql/NT
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv32641/NT
Modified Files:
Makefile
Log Message:
propagated changes of Thursday Sep 24 2009
from the Aug2009 branch to the development trunk
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/09/24 - sjoerd: NT/Makefile,1.33.2.1
Don't mind if sed cannot be found.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: Makefile
===================================================================
RCS file: /cvsroot/monetdb/sql/NT/Makefile,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- Makefile 3 Aug 2009 10:55:04 -0000 1.33
+++ Makefile 24 Sep 2009 13:35:22 -0000 1.34
@@ -30,7 +30,7 @@
if not "$(MAKEDIR)" == "$(prefix)" $(INSTALL) MSQLserver.bat "$(prefix)"
$(INSTALL) $(INSTALLER)\$(INSTALLER)$(IBITS).sln "$(prefix)"
$(INSTALL) $(INSTALLER)\$(INSTALLER)$(IBITS).vdproj "$(prefix)"
- if exist "C:\Program Files (x86)" if "$(bits)" == "32"
C:\cygwin\bin\sed.exe "s/Program Files/Program Files (x86)/"
$(INSTALLER)\$(INSTALLER)$(IBITS).vdproj >
"$(prefix)\$(INSTALLER)$(IBITS).vdproj"
+ -if exist "C:\Program Files (x86)" if "$(bits)" == "32"
C:\cygwin\bin\sed.exe -i "s/Program Files/Program Files (x86)/"
"$(prefix)\$(INSTALLER)$(IBITS).vdproj"
-devenv "$(prefix)\$(INSTALLER)$(IBITS).sln" /build
if exist "$(prefix)\$(INSTALLER)$(IBITS).msi" del /f
"$(prefix)\$(INSTALLER)$(IBITS).msi"
if exist "$(prefix)\Debug\$(INSTALLER)$(IBITS).msi" $(INSTALL) /Y
"$(prefix)"\Debug\$(INSTALLER)$(IBITS).msi "$(prefix)"
@@ -46,8 +46,8 @@
!IFDEF BITS32
install-m5installer:
$(INSTALL) MonetDB5-SQL\MonetDB5-SQL-Installer.sln "$(prefix)"
- if exist "C:\Program Files (x86)" C:\cygwin\bin\sed.exe "s/Program
Files/Program Files (x86)/" MonetDB5-SQL\MonetDB5-SQL-Installer.vdproj >
"$(prefix)\MonetDB5-SQL-Installer.vdproj"
- if not exist "C:\Program Files (x86)" $(INSTALL)
MonetDB5-SQL\MonetDB5-SQL-Installer.vdproj "$(prefix)"
+ $(INSTALL) MonetDB5-SQL\MonetDB5-SQL-Installer.vdproj "$(prefix)"
+ -if exist "C:\Program Files (x86)" C:\cygwin\bin\sed.exe -i "s/Program
Files/Program Files (x86)/" "$(prefix)\MonetDB5-SQL-Installer.vdproj"
!ENDIF
!IFDEF BITS64
------------------------------------------------------------------------------
Come build with us! The BlackBerry® Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9-12, 2009. Register now!
http://p.sf.net/sfu/devconf
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
