Fixed CORE-3544: make install fails

FirebirdSQL · Jul 1, 2011 · 3f5521e · 3f5521e
1 parent 1084b2f
commit 3f5521e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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)