[Gnucash-changes] r13269 - gnucash/trunk - Small QOF build fix for dist and non-srcdir builds:

[Derek Atkins]

Author: warlord
Date: 2006-02-15 11:19:17 -0500 (Wed, 15 Feb 2006)
New Revision: 13269
Trac: http://svn.gnucash.org/trac/changeset/13269

Modified:
   gnucash/trunk/ChangeLog
   gnucash/trunk/configure.in
   gnucash/trunk/lib/libqof/qof/Makefile.am
Log:
Small QOF build fix for dist and non-srcdir builds:
	* lib/libqof/qof/Makefile.am: keep qofla-dir.h out of the dist
	* configure.in: look in builddir for qof includes.



Modified: gnucash/trunk/ChangeLog
===================================================================
--- gnucash/trunk/ChangeLog	2006-02-15 15:16:45 UTC (rev 13268)
+++ gnucash/trunk/ChangeLog	2006-02-15 16:19:17 UTC (rev 13269)
@@ -3,6 +3,9 @@
 	* src/business/business-core/business-core.scm: 
 	  Fix a typo; forgot one procedure name-change instance.
 
+	* lib/libqof/qof/Makefile.am: keep qofla-dir.h out of the dist
+	* configure.in: look in builddir for qof includes.
+
 2006-02-14  Derek Atkins  <derek at ihtfp.com>
 
 	* src/report/standard-reports/advanced-portfolio.scm:

Modified: gnucash/trunk/configure.in
===================================================================
--- gnucash/trunk/configure.in	2006-02-15 15:16:45 UTC (rev 13268)
+++ gnucash/trunk/configure.in	2006-02-15 16:19:17 UTC (rev 13269)
@@ -465,7 +465,7 @@
 fi
 if test x$QOF_XML_DIR = x; then
 	QOF_LIB_DIR='${libdir}'
-	QOF_CFLAGS='-I${top_srcdir}/lib/libqof/qof'
+	QOF_CFLAGS='-I${top_builddir}/lib/libqof/qof -I${top_srcdir}/lib/libqof/qof'
 	QOF_LIBS='${top_builddir}/lib/libqof/qof/libqof.la'
 	QOF_VERSION="internal"
 	QOF_PREFIX="internal"

Modified: gnucash/trunk/lib/libqof/qof/Makefile.am
===================================================================
--- gnucash/trunk/lib/libqof/qof/Makefile.am	2006-02-15 15:16:45 UTC (rev 13268)
+++ gnucash/trunk/lib/libqof/qof/Makefile.am	2006-02-15 16:19:17 UTC (rev 13269)
@@ -60,9 +60,11 @@
    qofquerycore.h    \
    qofsession.h      \
    qofsql.h          \
-   qofla-dir.h       \
    qof_book_merge.h
 
+nodist_qofinclude_HEADERS = \
+   qofla-dir.h     
+
 noinst_HEADERS = \
    gnc-event-p.h \
    md5.h  \
@@ -82,7 +84,7 @@
   qofla-dir.h.in \
   qofmath128.c
 
-qofla-dir.h: qofla-dir.h.in Makefile
+qofla-dir.h: $(srcdir)/qofla-dir.h.in Makefile
 	rm -f $@.tmp
 	sed < $< > $@.tmp \
                 -e 's:@-libdir-@:${QOFLIBdir}:g'