MonetDB: default - Merge with Oct2010 branch.

[Sjoerd Mullender]

Changeset: 9d9418784399 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9d9418784399
Modified Files:
        
Branch: default
Log Message:

Merge with Oct2010 branch.


diffs (12 lines):

diff -r 7d3fc0eee50d -r 9d9418784399 buildtools/autogen/autogen/am.py
--- a/buildtools/autogen/autogen/am.py  Tue Oct 05 15:13:56 2010 +0200
+++ b/buildtools/autogen/autogen/am.py  Tue Oct 05 16:29:19 2010 +0200
@@ -440,7 +440,7 @@
         fd.write("\t$(RM) $(DESTDIR)%s/%s\n\n" % (sd, header))
         am['INSTALL'].append(h)
         am['UNINSTALL'].append(h)
-        if h not in headers['SOURCES']:
+        if header not in headers['SOURCES']:
             am['BUILT_SOURCES'].append(h)
         am['InstallList'].append("\t"+sd+"/"+header+cond+"\n")
 
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list