From fc144ada89261a5a1fc6c5a3ceb3bf2ac372ce84 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Vincent=20B=C3=A9ron?= <vberon@mecano.gme.usherb.ca>
Date: Tue, 15 Oct 2002 01:19:46 +0000
Subject: [PATCH] Actually compile Wine even if not installing as root.

---
 tools/wineinstall | 38 ++++++++++++++++++++++----------------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/tools/wineinstall b/tools/wineinstall
index ca1d478876c..a3007dbfc57 100755
--- a/tools/wineinstall
+++ b/tools/wineinstall
@@ -323,8 +323,9 @@ then {
     echo "We need to install wine as root user, do you want us to build wine,"
     echo "'su root' and install Wine?  Enter 'no' to continue without installing"
     conf_yesno_answer "(yes/no) "
+    ROOTINSTALL="$ANSWER"
 
-    if [ "$ANSWER" = "yes" ]
+    if [ "$ROOTINSTALL" = "yes" ]
     then {
       # start out with the basic command
       sucommand="make install"
@@ -344,26 +345,31 @@ then {
         # run ldconfig always just in case some updated files dont get linked
         sucommand="$sucommand;$ac_cv_path_LDCONFIG"
       fi
+    }
+    fi # [ "$ROOTINSTALL" = "yes" ]
 
-      echo
+    echo
 
-      echo "Compiling WINE. Grab a lunch or two, rent a video, or whatever,"
-      echo "in the meantime..."
-      echo
-      std_sleep
+    echo "Compiling WINE. Grab a lunch or two, rent a video, or whatever,"
+    echo "in the meantime..."
+    echo
+    std_sleep
 
-      # try to just make wine, if this fails 'make depend' and try to remake
-      if ! { make; }
+    # try to just make wine, if this fails 'make depend' and try to remake
+    if ! { make; }
+    then {
+      if ! { make depend && make; }
       then {
-        if ! { make depend && make; }
-        then {
-          echo
-          echo "Compilation failed, aborting install."
-          exit 1
-        }
-        fi
+        echo
+        echo "Compilation failed, aborting install."
+        exit 1
       }
       fi
+    }
+    fi
+
+    if [ "$ROOTINSTALL" = "yes" ]
+    then {
       echo
 
       echo "Performing 'make install' as root to install binaries, enter root password"
@@ -415,7 +421,7 @@ then {
       echo "in your logon scripts."
       echo
     }
-    fi
+    fi # [ "$ROOTINSTALL" = "yes" ]
   }
   fi # [ `whoami` != 'root' ]
 
-- 
2.11.4.GIT