From 3f5521e68b7756378ccf369fcc87f2a12261a73e Mon Sep 17 00:00:00 2001
From: alexpeshkoff <alexpeshkoff@users.sourceforge.net>
Date: Fri, 1 Jul 2011 09:22:23 +0000
Subject: [PATCH] Fixed CORE-3544: make install fails

---
 builds/install/arch-specific/hpux/Makefile.in                | 2 +-
 builds/install/arch-specific/linux/Makefile.in               | 2 +-
 builds/install/arch-specific/linux/misc/tarMainInstall.sh.in | 2 +-
 builds/install/arch-specific/netbsd/Makefile.in              | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/builds/install/arch-specific/hpux/Makefile.in b/builds/install/arch-specific/hpux/Makefile.in
index c2946de8343..f5152890799 100644
--- a/builds/install/arch-specific/hpux/Makefile.in
+++ b/builds/install/arch-specific/hpux/Makefile.in
@@ -128,4 +128,4 @@ buildTarDir: buildImageDir
 	(cd $(GEN_ROOT)/buildroot; cp manifest.txt ../$(TarDir)/manifest.txt )
 
 install: buildTarDir
-	(cd $(GEN_ROOT)/$(TarDir); ./install.sh)
+	(cd $(GEN_ROOT)/$(TarDir); FIREBIRD= FIREBIRD_LOCK= ./install.sh)
diff --git a/builds/install/arch-specific/linux/Makefile.in b/builds/install/arch-specific/linux/Makefile.in
index af739a5bf82..1ef36d32faf 100644
--- a/builds/install/arch-specific/linux/Makefile.in
+++ b/builds/install/arch-specific/linux/Makefile.in
@@ -157,7 +157,7 @@ buildTarDir: buildImageDir
 
 
 install: buildTarDir
-	(cd $(GEN_ROOT)/$(TarDir); FIREBIRD= ./install.sh)
+	(cd $(GEN_ROOT)/$(TarDir); FIREBIRD= FIREBIRD_LOCK= ./install.sh)
 	cp -r $(GEN_ROOT)/$(DebugDir)/* /
 
 
diff --git a/builds/install/arch-specific/linux/misc/tarMainInstall.sh.in b/builds/install/arch-specific/linux/misc/tarMainInstall.sh.in
index f2e9f197918..ea95bd133a4 100644
--- a/builds/install/arch-specific/linux/misc/tarMainInstall.sh.in
+++ b/builds/install/arch-specific/linux/misc/tarMainInstall.sh.in
@@ -39,7 +39,7 @@ if [ ! -z "$InteractiveInstall" ]
 then
     cat <<EOF
 
-Firebird classic $Version Installation
+Firebird @FIREBIRD_ARCH_TYPE@ $Version Installation
 
 EOF
 
diff --git a/builds/install/arch-specific/netbsd/Makefile.in b/builds/install/arch-specific/netbsd/Makefile.in
index 3f95381dca5..c6e0fa6a754 100644
--- a/builds/install/arch-specific/netbsd/Makefile.in
+++ b/builds/install/arch-specific/netbsd/Makefile.in
@@ -67,5 +67,5 @@ BuildVersion=$(FirebirdVersion).$(BuildNum)
 Version=$(BuildVersion)-$(PackageVersion)
 
 install:
-	(cd $(GEN_ROOT)/; ./install/install.netbsd.sh)
+	(cd $(GEN_ROOT)/; FIREBIRD= FIREBIRD_LOCK= ./install/install.netbsd.sh)