From f0b17f886632c7bc2d47de2487f0b463dd1ed3e8 Mon Sep 17 00:00:00 2001
From: alexpeshkoff <alexpeshkoff@users.sourceforge.net>
Date: Thu, 17 Jan 2008 15:46:40 +0000
Subject: [PATCH] Finishing merge - backported fix for CORE-1674: Wrong access
 rights in doc subdirectory

---
 builds/install/misc/classicLibrary.sh.in |  5 ++++-
 builds/install/misc/posixLibrary.sh.in   | 17 +++++++++++++++++
 builds/install/misc/superLibrary.sh.in   |  5 ++++-
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/builds/install/misc/classicLibrary.sh.in b/builds/install/misc/classicLibrary.sh.in
index 11af64d84c..2cf1afa068 100644
--- a/builds/install/misc/classicLibrary.sh.in
+++ b/builds/install/misc/classicLibrary.sh.in
@@ -111,7 +111,10 @@ fixFilePermissions() {
         chmod ug=rw,o= $i
     done
 	
-	cd ..
+	# fix up doc permissions
+	fixDocPermissions
+
+	cd $FBRootDir
 }
 
 
diff --git a/builds/install/misc/posixLibrary.sh.in b/builds/install/misc/posixLibrary.sh.in
index a121ea0ef4..27ac947415 100644
--- a/builds/install/misc/posixLibrary.sh.in
+++ b/builds/install/misc/posixLibrary.sh.in
@@ -520,6 +520,23 @@ MakeFileFirebirdWritable() {
 }
 
 
+#------------------------------------------------------------------------
+#  Set correct permissions for $FbRoot/doc tree
+
+fixDocPermissions() {
+	cd $FBRootDir
+
+	for i in `find doc -print`; do
+		chown root:root $i
+		if [ -d $i ]; then
+			chmod 0755 $i
+		else
+			chmod 0644 $i
+		fi
+	done
+}
+
+
 #------------------------------------------------------------------------
 # Run process and check status
 
diff --git a/builds/install/misc/superLibrary.sh.in b/builds/install/misc/superLibrary.sh.in
index cf24c53c7f..6c88aedcb9 100644
--- a/builds/install/misc/superLibrary.sh.in
+++ b/builds/install/misc/superLibrary.sh.in
@@ -65,7 +65,10 @@ fixFilePermissions() {
         chmod ug=rw,o= $i
     done
 	
-	cd ..
+	# fix up doc permissions
+	fixDocPermissions
+
+	cd $FBRootDir
 }