Changeset: b6ced64542c1 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b6ced64542c1
Modified Files:
Branch: default
Log Message:
Merge from Jun2010 branch.
diffs (11 lines):
diff -r 3920853fb751 -r b6ced64542c1 pathfinder/NT/Makefile
--- a/pathfinder/NT/Makefile Tue Jun 15 15:31:38 2010 +0200
+++ b/pathfinder/NT/Makefile Tue Jun 15 16:19:33 2010 +0200
@@ -44,6 +44,7 @@
if not "$(MAKEDIR)" == "$(prefix)" $(INSTALL) ..\NT\pf.bat "$(prefix)"
$(INSTALL) ..\NT\$(INSTALLER)\$(INSTALLER)$(IBITS).sln "$(prefix)"
$(INSTALL) ..\NT\$(INSTALLER)\$(INSTALLER)$(IBITS).vdproj "$(prefix)"
+ -if $(bits)==32 if exist "C:\Program Files (x86)" 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)"
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
