Changeset: 4e5ff4368161 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4e5ff4368161
Modified Files:
buildtools/autogen/autogen/am.py
Branch: Oct2010
Log Message:
Check for existence of correct path.
autogen runs in the top dir, so we have add the name of the directory
we're doing work for to the name of the file we want to check.
diffs (24 lines):
diff -r c9a1ba56fef9 -r 4e5ff4368161 buildtools/autogen/autogen/am.py
--- a/buildtools/autogen/autogen/am.py Thu Nov 18 11:46:19 2010 +0100
+++ b/buildtools/autogen/autogen/am.py Thu Nov 18 13:15:10 2010 +0100
@@ -356,10 +356,10 @@
fd.write(" C_script_%s = script_%s\n" % (mkname, script))
for condname in scripts['COND']:
fd.write("endif\n")
- if not os.path.exists(script):
+ if not os.path.exists(os.path.join(am['CWDRAW'], script)):
am['BUILT_SOURCES'].append("$(C_" +mkname+ ")")
am['EXTRA_DIST'].append(script)
- elif os.path.exists(script):
+ elif os.path.exists(os.path.join(am['CWDRAW'], script)):
am['EXTRA_DIST'].append(script)
else:
am['BUILT_SOURCES'].append(script)
@@ -1126,6 +1126,7 @@
if cwd != topdir:
# in case we happen to be running this on Windows, replace dir seps
am['CWD'] = cwd[len(topdir)+1:].replace('\\', '/')+'/'
+ am['CWDRAW'] = cwd
am['BUILT_SOURCES'] = []
am['EXTRA_DIST'] = []
am['LIBS'] = [] # all libraries (am_libs and am_library)
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
