From f654efe02445c92661a20feffa9b2a9f40c996f5 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 21 Mar 2011 16:06:39 +0200
Subject: Fix issues with build outside source directory

---
 composite/makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'composite/makefile')

diff --git a/composite/makefile b/composite/makefile
index 4f12b40..5881af0 100644
--- a/composite/makefile
+++ b/composite/makefile
@@ -38,7 +38,7 @@ endif
 # Build.
 #
 $(driver): $(cxx_obj) $(odb_db.l) $(odb.l)
-$(cxx_obj) $(cxx_od): cpp_options := -I$(out_base)
+$(cxx_obj) $(cxx_od): cpp_options := -I$(out_base) -I$(src_base)
 $(cxx_obj) $(cxx_od): $(odb.l.cpp-options) $(odb_db.l.cpp-options)
 
 ifeq ($(db_id),mysql)
@@ -52,7 +52,7 @@ $(gen): $(odb)
 $(gen): odb := $(odb)
 $(gen) $(dist): export odb_options += --database $(db_id) --generate-schema \
 --generate-query
-$(gen): cpp_options := -I$(out_base)
+$(gen): cpp_options := -I$(src_base)
 $(gen): $(odb.l.cpp-options)
 
 $(call include-dep,$(cxx_od),$(cxx_obj),$(gen))
@@ -80,7 +80,7 @@ $(dist):
 
 # Test.
 #
-$(test): schema := $(src_base)/$(basename $(odb_hdr)).sql
+$(test): schema := $(out_base)/$(basename $(odb_hdr)).sql
 $(test): $(driver)
 	$(call message,sql $$1,$(dcf_root)/db-driver $$1,$(schema))
 	$(call message,test $<,$< --options-file $(dcf_root)/db.options)
-- 
cgit v1.1