aboutsummaryrefslogtreecommitdiff
path: root/build
diff options
context:
space:
mode:
Diffstat (limited to 'build')
-rw-r--r--build/bootstrap.make2
-rw-r--r--build/configuration-rules.make4
-rwxr-xr-xbuild/mssql/configure4
-rwxr-xr-xbuild/mysql/configure4
-rwxr-xr-xbuild/oracle/configure4
-rwxr-xr-xbuild/pgsql/configure4
-rwxr-xr-xbuild/sqlite/configure2
7 files changed, 12 insertions, 12 deletions
diff --git a/build/bootstrap.make b/build/bootstrap.make
index cef108e..178f2aa 100644
--- a/build/bootstrap.make
+++ b/build/bootstrap.make
@@ -52,7 +52,7 @@ $(out_base)/.dist: export odb_header_stem := test
#
ifeq ($(filter $(db_id),sqlite),)
$(out_base)/.test: schema-body = \
-$(call message,sql $$1,$(dcf_root)/db-driver $$1,$1)$(literal_newline)$(literal_tab)
+$(call message,sql $$1,$(dcf_root)/$(db_id)-driver $$1,$1)$(literal_newline)$(literal_tab)
$(out_base)/.test: schema = \
$(foreach s,$(if $1,$1,$(out_base)/test.sql),$(call schema-body,$s))@:
endif
diff --git a/build/configuration-rules.make b/build/configuration-rules.make
index 5576495..fb9f51f 100644
--- a/build/configuration-rules.make
+++ b/build/configuration-rules.make
@@ -9,8 +9,8 @@ ifndef %foreign%
disfigure::
$(call message,rm $$1,rm -f $$1,$(dcf_root)/configuration-dynamic.make)
- $(call message,rm $$1,rm -f $$1,$(dcf_root)/db.options)
- $(call message,rm $$1,rm -f $$1,$(dcf_root)/db-driver)
+ $(call message,rm $$1,rm -f $$1,$(dcf_root)/*.options)
+ $(call message,rm $$1,rm -f $$1,$(dcf_root)/*-driver)
endif
diff --git a/build/mssql/configure b/build/mssql/configure
index 33fbf7b..9603c10 100755
--- a/build/mssql/configure
+++ b/build/mssql/configure
@@ -39,8 +39,8 @@ $echo
server=`read_value ""`
-opt=$dcf_root/db.options
-drv=$dcf_root/db-driver
+opt=$dcf_root/mssql.options
+drv=$dcf_root/mssql-driver
echo "--user '$user'" >$opt
echo "--password '$passwd'" >>$opt
diff --git a/build/mysql/configure b/build/mysql/configure
index afbf849..704a96f 100755
--- a/build/mysql/configure
+++ b/build/mysql/configure
@@ -53,8 +53,8 @@ $echo
socket=`read_value "NULL"`
-opt=$dcf_root/db.options
-drv=$dcf_root/db-driver
+opt=$dcf_root/mysql.options
+drv=$dcf_root/mysql-driver
echo "--user '$user'" >$opt
diff --git a/build/oracle/configure b/build/oracle/configure
index bcd3c6c..0366b76 100755
--- a/build/oracle/configure
+++ b/build/oracle/configure
@@ -55,8 +55,8 @@ $echo
service=`read_value ""`
-opt=$dcf_root/db.options
-drv=$dcf_root/db-driver
+opt=$dcf_root/oracle.options
+drv=$dcf_root/oracle-driver
if [ -n "$user" ]; then
echo "--user '$user'" >$opt
diff --git a/build/pgsql/configure b/build/pgsql/configure
index 2e78a13..d129b54 100755
--- a/build/pgsql/configure
+++ b/build/pgsql/configure
@@ -44,8 +44,8 @@ $echo
port=`read_value ""`
-opt=$dcf_root/db.options
-drv=$dcf_root/db-driver
+opt=$dcf_root/pgsql.options
+drv=$dcf_root/pgsql-driver
echo "--user '$user'" >$opt
echo "--database '$db'" >>$opt
diff --git a/build/sqlite/configure b/build/sqlite/configure
index 75a4773..a454df9 100755
--- a/build/sqlite/configure
+++ b/build/sqlite/configure
@@ -16,6 +16,6 @@ $echo
db=`read_value "/tmp/odb-test.db"`
-opt=$dcf_root/db.options
+opt=$dcf_root/sqlite.options
echo "--database '$db'" >$opt