[ooo-build-commit] .: configure.in

Tor Lillqvist tml at kemper.freedesktop.org
Thu Oct 7 05:17:11 PDT 2010


 configure.in |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 11b9b0ffb58da2716434724d76c809722048bfea
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Oct 7 15:14:58 2010 +0300

    Don't bother with x bit for instmsiw.exe
    
    It isn't a Cygwin program anyhow, and isn't run from Cygwin, so no
    need to check if it is "executable", or to chmod it "executable" from
    a Cygwin point of view. No Windows file protection information will
    propagate through the installer anyway, whatever the Cygwin chmod
    would do.

diff --git a/configure.in b/configure.in
index 71de7fb..72987f1 100644
--- a/configure.in
+++ b/configure.in
@@ -5889,12 +5889,12 @@ dnl ===================================================================
 if test "$_os" = "WINNT"; then
    if test  "$WITH_MINGWIN" = "yes" || test "$COMEX" -ge "10"; then
    AC_MSG_CHECKING([for instmsiw.exe])
-   if test -x ./external/msi/instmsiw.exe; then
+   if test -f ./external/msi/instmsiw.exe; then
       AC_MSG_RESULT([found])
    else
       MSIWPATH=`/bin/find "$COMPATH/.." -iname instmsiw.exe | head -n 1`
       if test -n "$MSIWPATH"; then
-         cp "$MSIWPATH" ./external/msi/ && chmod +x ./external/msi/instmsiw.exe && MSIWCOPY="OK"
+         cp "$MSIWPATH" ./external/msi/ && MSIWCOPY="OK"
       fi
       if test -z "$MSIWCOPY"; then
          AC_MSG_ERROR([instmsiw.exe is missing in the default location.


More information about the ooo-build-commit mailing list