1 files changed, 19 insertions, 9 deletions
diff --git a/database/firebird/INSTALL b/database/firebird/INSTALL
index b070251d39..d3947ddcd4 100755
--- a/database/firebird/INSTALL
+++ b/database/firebird/INSTALL
@@ -1,9 +1,19 @@
-if [ $FB_CLIENT == n ]; then
-cd $SOURCE_DIRECTORY/gen/buildroot/$FB_PREFIX                &&
-# install config files first
-install_config_file firebird.conf $FB_PREFIX/firebird.conf   &&
-install_config_file aliases.conf  $FB_PREFIX/aliases.conf    &&
-rm aliases.conf firebird.conf
-fi                                                           &&
-# install prebuilt tree
-cp -ra $SOURCE_DIRECTORY/gen/buildroot/* $INSTALL_ROOT/
+local FF FBDEST                   &&
+mkdir -p ${FB_PREFIX}/intl        &&
+if [[ $FB_CLIENT == n ]]; then
+# prepare an install image
+  cd $SOURCE_DIRECTORY/gen        &&
+  ./install/makeInstallImage.sh   &&
+# config files
+  cd $SOURCE_DIRECTORY/gen/install/misc                         &&
+  install_config_file firebird.conf $FB_PREFIX/firebird.conf    &&
+  install_config_file aliases.conf  $FB_PREFIX/aliases.conf     &&
+  install_config_file fbintl.conf   $FB_PREFIX/intl/fbintl.conf
+else
+  cd $SOURCE_DIRECTORY/gen/firebird    &&
+  for FF in bin include lib;do
+    FBDEST=$FB_PREFIX/$FF              &&
+    mkdir -p $FBDEST                   &&
+    cp -ar $FF/* $FBDEST/$FF
+  done
+fi