Update of /cvsroot/monetdb/buildtools/autogen/autogen
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv20646/autogen/autogen
Modified Files:
am.py
Log Message:
propagated changes of Tuesday Sep 18 2007 - Monday Sep 24 2007
from the MonetDB_1-20 branch to the development trunk
Index: am.py
===================================================================
RCS file: /cvsroot/monetdb/buildtools/autogen/autogen/am.py,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- am.py 17 Sep 2007 07:52:54 -0000 1.55
+++ am.py 24 Sep 2007 08:13:13 -0000 1.56
@@ -383,6 +383,7 @@
cond = ''
h = header
if headers.has_key('COND'):
+ cond = '#' + string.join(headers['COND'], '+')
mkname = am_normalize(string.replace(header, '.', '_'))
for condname in headers['COND']:
fd.write('if %s\n' % condname)
@@ -390,6 +391,9 @@
h = '$(C_%s)' % mkname
for condname in headers['COND']:
fd.write('endif\n')
+ if cond:
+ fd.write("uninstall-local-:\n");
+ fd.write("install-exec-local-:\n");
fd.write("install-exec-local-%s: %s\n" % (header, header))
fd.write("\t-mkdir -p $(DESTDIR)%s\n" % sd)
fd.write("\t-$(RM) $(DESTDIR)%s/%s\n" % (sd, header))
@@ -399,9 +403,6 @@
am['INSTALL'].append(h)
am['UNINSTALL'].append(h)
am['BUILT_SOURCES'].append(h)
- cond = ''
- if headers.has_key('COND'):
- cond = '#' + string.join(headers['COND'], '+')
am['InstallList'].append("\t"+sd+"/"+header+cond+"\n")
am_find_ins(am, headers)
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
