From: Date: July 23 2008 2:19pm
Subject: bzr commit into mysql-6.0-falcon branch (olav:2754) Bug#37622
List-Archive: http://lists.mysql.com/commits/50305
X-Bug: 37622
Message-Id: <20080723121956.778.qmail@khepri11>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

#At file:///home/os136802/mysql/develop/repo/falcon-make/

 2754 Olav Sandstaa	2008-07-23
      Part of fix of Bug#37622 Falcon does not compile on Solaris 9 on SPARC using Sun Studio compiler.
      
      Changes the INCLUDES macro to avoid that the final continuation line will not be empty in case
      FALCON_SPARC_ASSEMBLY is not set.
modified:
  storage/falcon/Makefile.am

per-file messages:
  storage/falcon/Makefile.am
    Changes the INCLUDES macro to avoid that the final continuation line will not be empty in case
    FALCON_SPARC_ASSEMBLY is not set.
=== modified file 'storage/falcon/Makefile.am'

=== modified file 'storage/falcon/Makefile.am'
--- a/storage/falcon/Makefile.am	2008-07-19 03:03:39 +0000
+++ b/storage/falcon/Makefile.am	2008-07-23 12:19:47 +0000
@@ -22,9 +22,8 @@
       -D_REENTRANT -D_PTHREADS -DFALCONDB -DSTORAGE_ENGINE -DNAMESPACE=Nfs
 
 INCLUDES= -I$(top_srcdir)/include -I$(top_builddir)/include \
-	  -I$(top_srcdir)/regex -I$(top_srcdir)/sql \
-	  -I$(srcdir) -I$(srcdir)/TransformLib @ZLIB_INCLUDES@ \
-	  @FALCON_SPARC_ASSEMBLY@
+	  -I$(top_srcdir)/regex -I$(top_srcdir)/sql -I$(srcdir) \
+	  -I$(srcdir)/TransformLib @ZLIB_INCLUDES@ @FALCON_SPARC_ASSEMBLY@
 
 falcon_headers= Agent.h Alias.h Application.h \
 		AsciiBlob.h \