diff options
Diffstat (limited to 'editors/openoffice.org-2.0-devel/files/patch-i67139')
-rw-r--r-- | editors/openoffice.org-2.0-devel/files/patch-i67139 | 65 |
1 files changed, 65 insertions, 0 deletions
diff --git a/editors/openoffice.org-2.0-devel/files/patch-i67139 b/editors/openoffice.org-2.0-devel/files/patch-i67139 new file mode 100644 index 000000000000..b43a2035a9a0 --- /dev/null +++ b/editors/openoffice.org-2.0-devel/files/patch-i67139 @@ -0,0 +1,65 @@ +Index: work/config_office/configure.in +=================================================================== +RCS file: /cvs/tools/config_office/configure.in,v +retrieving revision 1.168 +diff -u -r1.168 configure.in +--- config_office/configure.in 5 Jul 2006 22:32:27 -0000 1.168 ++++ config_office/configure.in 8 Jul 2006 05:14:53 -0000 +@@ -1059,14 +1059,14 @@ + dnl =================================================================== + dnl Check whether the chosen shell can be used. + dnl =================================================================== +-if test "$with_use_shell" == "tcsh"; then ++if test "$with_use_shell" = "tcsh"; then + AC_PATH_PROG(SHELLPATH, tcsh) + if test -z "$SHELLPATH"; then + AC_MSG_ERROR([tcsh not found in \$PATH]) + else + SHELLPATH=`echo $SHELLPATH | $SED -n "s/\/tcsh//p"` + fi +-elif test "$with_use_shell" == "bash"; then ++elif test "$with_use_shell" = "bash"; then + AC_PATH_PROG(SHELLPATH, bash) + if test -z "$SHELLPATH"; then + AC_MSG_ERROR([bash not found in \$PATH]) +Index: work/config_office/configure +=================================================================== +RCS file: /cvs/tools/config_office/configure,v +retrieving revision 1.153 +diff -u -r1.153 configure +--- config_office/configure 6 Jul 2006 08:51:06 -0000 1.153 ++++ config_office/configure 8 Jul 2006 05:15:35 -0000 +@@ -3150,7 +3183,7 @@ + + + +-if test "$with_use_shell" == "tcsh"; then ++if test "$with_use_shell" = "tcsh"; then + # Extract the first word of "tcsh", so it can be a program name with args. + set dummy tcsh; ac_word=$2 + echo "$as_me:$LINENO: checking for $ac_word" >&5 +@@ -3197,7 +3230,7 @@ + else + SHELLPATH=`echo $SHELLPATH | $SED -n "s/\/tcsh//p"` + fi +-elif test "$with_use_shell" == "bash"; then ++elif test "$with_use_shell" = "bash"; then + # Extract the first word of "bash", so it can be a program name with args. + set dummy bash; ac_word=$2 + echo "$as_me:$LINENO: checking for $ac_word" >&5 +Index: config_office/set_soenv.in +=================================================================== +RCS file: /cvs/tools/config_office/set_soenv.in,v +retrieving revision 1.107 +diff -u -r1.107 set_soenv.in +--- config_office/set_soenv.in 5 Jul 2006 22:32:39 -0000 1.107 ++++ config_office/set_soenv.in 8 Jul 2006 05:23:48 -0000 +@@ -1965,7 +1994,7 @@ + open( OUT, ">$bootfile" ) || + die "Cannot open $bootfile: $!\n"; + print OUT "#!/bin/sh\n"; +-print OUT "export _ISBOOTSTRAP_=TRUE ; source $SRC_ROOT/$outfile.sh\n"; ++print OUT "export _ISBOOTSTRAP_=TRUE ; . $SRC_ROOT/$outfile.sh\n"; + close( OUT ) || print "Can't close $bootfile: $!"; + system(`cat bootstrap.1 >> bootstrap`); + system(`chmod +x bootstrap`); |