ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Actually compile Wine even if not installing as root.

This commit is contained in:
Vincent Béron 2002-10-15 01:19:46 +00:00 committed by Alexandre Julliard
parent 16ae4e6a72
commit fc144ada89
1 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
tools/wineinstall
View File

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