diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-10-31 01:50:43 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-10-31 08:51:09 +0000 |
| commit | 31e3fc0fd077fbe272e6a0311cb3e0584e6d6d8a (patch) | |
| tree | 74a1f028b182fb24614a0dc3811e5e41144be66d /macosx-setup.sh | |
| parent | d93bf88af02a5c9e52c06c1e86844c48b90f2b59 (diff) | |
Fix name of C-Ares source directory & make the name of the -done file match it.
The directory's name begins with "c-ares-", not "cares-". Fix that, and
make the -done file's name begin with "c-ares-" as well.
Change-Id: Ifa178c638ca634ca6b762b12290ccfcc4fa928f9
Reviewed-on: https://code.wireshark.org/review/5015
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'macosx-setup.sh')
| -rwxr-xr-x | macosx-setup.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/macosx-setup.sh b/macosx-setup.sh index 9c00fbc81f..08c50d7530 100755 --- a/macosx-setup.sh +++ b/macosx-setup.sh @@ -154,14 +154,14 @@ uninstall() { # old configurations. # - installed_cares_version=`ls cares-*-done 2>/dev/null | sed 's/cares-\(.*\)-done/\1/'` + installed_cares_version=`ls c-ares-*-done 2>/dev/null | sed 's/c-ares-\(.*\)-done/\1/'` if [ ! -z "$installed_cares_version" ] ; then echo "Uninstalling C-Ares API:" - cd cares-$installed_cares_version + cd c-ares-$installed_cares_version $DO_MAKE_UNINSTALL || exit 1 make distclean || exit 1 cd .. - rm cares-$installed_cares_version-done + rm c-ares-$installed_cares_version-done fi installed_geoip_version=`ls geoip-*-done 2>/dev/null | sed 's/geoip-\(.*\)-done/\1/'` @@ -1360,7 +1360,7 @@ then touch geoip-$GEOIP_VERSION-done fi -if [ "$CARES_VERSION" -a ! -f cares-$CARES_VERSION-done ] +if [ "$CARES_VERSION" -a ! -f c-ares-$CARES_VERSION-done ] then echo "Downloading, building, and installing C-Ares API:" [ -f c-ares-$CARES_VERSION.tar.gz ] || curl -L -O http://c-ares.haxx.se/download/c-ares-$CARES_VERSION.tar.gz || exit 1 @@ -1370,7 +1370,7 @@ then make $MAKE_BUILD_OPTS || exit 1 $DO_MAKE_INSTALL || exit 1 cd .. - touch cares-$CARES_VERSION-done + touch c-ares-$CARES_VERSION-done fi echo "" |