Changeset: da009513bc06 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=da009513bc06 Modified Files: Branch: Oct2010 Log Message:
Merge with Jun2010 branch. diffs (28 lines): diff -r 0f3724fedfcb -r da009513bc06 buildtools/Makefile.msc --- a/buildtools/Makefile.msc Wed Sep 08 17:45:32 2010 +0200 +++ b/buildtools/Makefile.msc Wed Sep 08 17:59:10 2010 +0200 @@ -22,13 +22,13 @@ prefix = $(MAKEDIR)\NT all: - cd autogen && python setup.py build + cd autogen && setup.py build cd Mx && $(MAKE) /nologo /f Makefile.msc cd mel && $(MAKE) /nologo /f Makefile.msc cd burg && $(MAKE) /nologo /f Makefile.msc install: - cd autogen && python setup.py install "--prefix=$(prefix)" + cd autogen && setup.py install "--prefix=$(prefix)" cd Mx && $(MAKE) /nologo /f Makefile.msc "prefix=$(prefix)" install cd mel && $(MAKE) /nologo /f Makefile.msc "prefix=$(prefix)" install cd burg && $(MAKE) /nologo /f Makefile.msc "prefix=$(prefix)" install diff -r 0f3724fedfcb -r da009513bc06 buildtools/autogen/setup.py --- a/buildtools/autogen/setup.py Wed Sep 08 17:45:32 2010 +0200 +++ b/buildtools/autogen/setup.py Wed Sep 08 17:59:10 2010 +0200 @@ -1,3 +1,5 @@ +#!/usr/bin/env python + # The contents of this file are subject to the MonetDB Public License # Version 1.1 (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at _______________________________________________ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list