osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Renaming libtool* to glibtool* might require root permission. 

Define DO_MV as "mv" or "sudo mv", depending on whether the user has
write access to /usr/local/bin, and use it to rename libtool* to
glibtool* and vice versa.

Change-Id: Ifbef4daa4521852bc200522743df9d23e7f0d1c2
Reviewed-on: https://code.wireshark.org/review/4295
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Guy Harris 2014-09-25 23:05:20 -07:00
parent 82d1a85ad2
commit 92a0cb85f3
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
macosx-setup.sh
View File

@ -378,8 +378,8 @@ uninstall() {
if [ ! -z "$installed_libtool_version" ] ; then
echo "Uninstalling GNU libtool:"
cd libtool-$installed_libtool_version
mv /usr/local/bin/glibtool /usr/local/bin/libtool
mv /usr/local/bin/glibtoolize /usr/local/bin/libtoolize
$DO_MV /usr/local/bin/glibtool /usr/local/bin/libtool
$DO_MV /usr/local/bin/glibtoolize /usr/local/bin/libtoolize
$DO_MAKE_UNINSTALL || exit 1
make distclean || exit 1
cd ..
@ -433,10 +433,12 @@ then
DO_MAKE_INSTALL="make install"
DO_MAKE_UNINSTALL="make uninstall"
DO_RM="rm"
DO_MV="mv"
else
DO_MAKE_INSTALL="sudo make install"
DO_MAKE_UNINSTALL="sudo make uninstall"
DO_RM="sudo rm"
DO_MV="sudo mv"
fi
#
@ -778,8 +780,8 @@ if [ "$LIBTOOL_VERSION" -a ! -f libtool-$LIBTOOL_VERSION-done ] ; then
./configure || exit 1
make $MAKE_BUILD_OPTS || exit 1
$DO_MAKE_INSTALL || exit 1
mv /usr/local/bin/libtool /usr/local/bin/glibtool
mv /usr/local/bin/libtoolize /usr/local/bin/glibtoolize
$DO_MV /usr/local/bin/libtool /usr/local/bin/glibtool
$DO_MV /usr/local/bin/libtoolize /usr/local/bin/glibtoolize
cd ..
touch libtool-$LIBTOOL_VERSION-done
fi