Update of /cvsroot/monetdb/buildtools/autogen/autogen
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv17427/autogen/autogen

Modified Files:
        am.py 
Log Message:
Updates to the .spec files to be ever so slightly more compatible with
the Fedora packaging guidelines.

Use %configure instead of ./configure.  This implies removing the
--prefix, --bindir, etc. options.  This also implies that the compiler
will be called with -D_FORTIFY_SOURCE=2 which makes that the compiler
is even stricter than before.  So we do that now as well.

Some fixes to get things compiled with -D_FORTIFY_SOURCE=2.  Mostly,
we need to do something with the result of functions such as fwrite,
fread, ftruncate, system.

Added descriptions to all packages.

Created a MonetDB-testing package.

Enabled the MonetDB-SQL-devel package.

When creating the tar balls, remove extraneous execute bits, and don't
include files that are generated by configure (i.e. files for which
there is a corresponding .in file).


Index: am.py
===================================================================
RCS file: /cvsroot/monetdb/buildtools/autogen/autogen/am.py,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- am.py       4 Sep 2007 12:30:14 -0000       1.46
+++ am.py       5 Sep 2007 17:05:43 -0000       1.47
@@ -122,8 +122,9 @@
     fd.write("dist-hook:\n")
     for i in values:
         fd.write("\tmkdir -p $(distdir)/%s\n" % i)
-        fd.write("\tcp -R $(srcdir)/%s/* $(distdir)/%s\n" % (i, i))
+        fd.write("\tcp -pR $(srcdir)/%s/* $(distdir)/%s\n" % (i, i))
         fd.write("\trm -rf `find $(distdir)/%s -name CVS -print`\n" % i)
+        fd.write("\tfind $(distdir)/%s -perm -0111 -type f ! -name \\*.bat ! 
-name \\*.sh ! -exec grep -q '^#!' {} \\; -print | xargs --no-run-if-empty 
chmod -x\n" % i)
 
 def am_extra_headers(fd, var, values, am):
     for i in values:
@@ -1124,8 +1125,9 @@
 if HAVE_EXTRA_MK
   include $(top_builddir)/extra.mk
 endif
-include $(top_builddir)/rpm.mk
 ''')
+    if cwd == topdir:
+        fd.write('include $(top_builddir)/rpm.mk\n')
     fd.close()
 
     return am['InstallList'], am['DocList'], am['OutList']


-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >>  http://get.splunk.com/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins

Reply via email to