[Firebird-checkins] SF.net SVN: firebird:[51674] firebird/branches/B2_5_Release

[<ale...@us...>]

Revision: 51674
          http://firebird.svn.sourceforge.net/firebird/?rev=51674&view=rev
Author:   alexpeshkoff
Date:     2010-10-13 12:47:42 +0000 (Wed, 13 Oct 2010)

Log Message:
-----------
Fixed CORE-3166: Script changeMultiConnectMode.sh should not be present in SS environment

Modified Paths:
--------------
    firebird/branches/B2_5_Release/builds/install/arch-specific/linux/misc/makeInstallImage.sh.in
    firebird/branches/B2_5_Release/configure.in

Modified: firebird/branches/B2_5_Release/builds/install/arch-specific/linux/misc/makeInstallImage.sh.in
===================================================================
--- firebird/branches/B2_5_Release/builds/install/arch-specific/linux/misc/makeInstallImage.sh.in	2010-10-13 12:11:52 UTC (rev 51673)
+++ firebird/branches/B2_5_Release/builds/install/arch-specific/linux/misc/makeInstallImage.sh.in	2010-10-13 12:47:42 UTC (rev 51674)
@@ -51,15 +51,18 @@
 	libTdir=$3
 	libTarget=$libTdir/$libScript
 
-	rm -f $libTarget
-	touch $libTarget
-	for i in posixLibrary.sh @FIR...@Li... linuxLibrary.sh
-	do
-		echo "# $i" >>$libTarget
-		cat $libSdir/$i >>$libTarget
-		echo "" >>$libTarget	# avoid missing linefeed
-	done
-	cat $libSdir/$libScript >>$libTarget
+	if [ -f $libSdir/$libScript ]
+	then
+		rm -f $libTarget
+		touch $libTarget
+		for i in posixLibrary.sh @FIR...@Li... linuxLibrary.sh
+		do
+			echo "# $i" >>$libTarget
+			cat $libSdir/$i >>$libTarget
+			echo "" >>$libTarget	# avoid missing linefeed
+		done
+		cat $libSdir/$libScript >>$libTarget
+	fi
 }
 
 

Modified: firebird/branches/B2_5_Release/configure.in
===================================================================
--- firebird/branches/B2_5_Release/configure.in	2010-10-13 12:11:52 UTC (rev 51673)
+++ firebird/branches/B2_5_Release/configure.in	2010-10-13 12:47:42 UTC (rev 51674)
@@ -1225,11 +1225,15 @@
 gen/firebird/bin/taruninstall.sh:builds/install/arch-specific/linux/misc/taruninstall.sh.in
 gen/firebird/bin/tarMainUninstall.sh:builds/install/arch-specific/linux/misc/tarMainUninstall.sh.in
 gen/firebird/bin/changeDBAPassword.sh:builds/install/misc/changeDBAPassword.sh.in
-gen/firebird/bin/changeMultiConnectMode.sh:builds/install/misc/changeMultiConnectMode.sh.in
 gen/firebird/bin/changeGdsLibraryCompatibleLink.sh:builds/install/misc/changeGdsLibraryCompatibleLink.sh.in
 gen/firebird/bin/createAliasDB.sh:builds/install/misc/createAliasDB.sh.in],
 [chmod a+x gen/install/scripts/*.sh gen/install/*sh 2>/dev/null])
 
+if test $FIREBIRD_ARCH_TYPE = classic; then
+	AC_CONFIG_FILES([gen/firebird/bin/changeMultiConnectMode.sh:builds/install/misc/changeMultiConnectMode.sh.in],
+	[chmod a+x gen/install/scripts/*.sh gen/install/*sh 2>/dev/null])
+fi
+
 dnl: Platform Specific Files
 
 case "$PLATFORM" in


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.