From 1e92015c3ebdeb3050f389e2fda5484c1d50a98d Mon Sep 17 00:00:00 2001
From: Constantin Michael <constantin@codesynthesis.com>
Date: Fri, 11 Nov 2011 13:55:23 +0200
Subject: Allow Instant Client installation to be specified during
 configuration

---
 build/import/liboci/rules.make | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'build/import/liboci/rules.make')

diff --git a/build/import/liboci/rules.make b/build/import/liboci/rules.make
index 6c980b4..2376ba3 100644
--- a/build/import/liboci/rules.make
+++ b/build/import/liboci/rules.make
@@ -4,14 +4,16 @@
 # license   : ODB NCUEL; see accompanying LICENSE file
 
 $(dcf_root)/import/liboci/%: root := $(liboci_root)
+$(dcf_root)/import/liboci/%: include := $(liboci_include)
+$(dcf_root)/import/liboci/%: lib := $(liboci_lib)
 $(dcf_root)/import/liboci/oci.l: | $(dcf_root)/import/liboci/.
 
-$(dcf_root)/import/liboci/oci.l: $(liboci_root)/lib/libclntsh.so
-	@echo $< >$@
-	@echo rpath:$(root)/lib >>$@
+$(dcf_root)/import/liboci/oci.l: $(liboci_lib)
+	@echo $(lib) >$@
+	@echo rpath:$(dir $(lib)) >>$@
 
 $(dcf_root)/import/liboci/oci.l.cpp-options: | $(dcf_root)/import/liboci/.
-	@echo include: -I$(root)/rdbms/public >$@
+	@echo include: -I$(include) >$@
 
 ifndef %foreign%
 
-- 
cgit v1.1