Wineinstall non-root compilation

[Vincent Béron]

Changelog
Actually compile Wine even if not installing as root.

Vincent
-------------- next part --------------
Index: tools/wineinstall
===================================================================
RCS file: /home/wine/wine/tools/wineinstall,v
retrieving revision 1.41
diff -u -r1.41 wineinstall
--- tools/wineinstall	23 Sep 2002 19:55:12 -0000	1.41
+++ tools/wineinstall	12 Oct 2002 15:52:41 -0000
@@ -316,8 +316,9 @@
     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"
@@ -337,26 +338,31 @@
         # 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"
@@ -408,7 +414,7 @@
       echo "in your logon scripts."
       echo
     }
-    fi
+    fi # [ "$ROOTINSTALL" = "yes" ]
   }
   fi # [ `whoami` != 'root' ]