diff options
author | B. Watson <yalhcru@gmail.com> | 2017-03-21 04:01:23 -0400 |
---|---|---|
committer | David Spencer <idlemoor@slackbuilds.org> | 2017-03-25 13:28:29 +0000 |
commit | 8fcb5bd5128f42e545970c7ba9c6d842366efb8f (patch) | |
tree | 5f2c832df9754bc3e9130dba69ed5c9566d258ac | |
parent | 79fca135270d451a041fc4f2f29c0be8642fb44f (diff) | |
download | slackbuilds-8fcb5bd5128f42e545970c7ba9c6d842366efb8f.tar.gz |
network/avahi: Allow VERSION override, fix user/group detection.
Signed-off-by: B. Watson <yalhcru@gmail.com>
Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
-rw-r--r-- | network/avahi/avahi.SlackBuild | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/network/avahi/avahi.SlackBuild b/network/avahi/avahi.SlackBuild index 8f9dcfe8ef..f789d9f705 100644 --- a/network/avahi/avahi.SlackBuild +++ b/network/avahi/avahi.SlackBuild @@ -27,13 +27,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=avahi -VERSION=0.6.31 +VERSION=${VERSION:-0.6.31} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -60,15 +60,15 @@ warn_accounts() { } # Bail if user and/or group isn't valid on your system -if ! grep -q "^avahi:" /etc/passwd; then +if ! getent passwd avahi &>/dev/null; then warn_accounts fi -if ! grep -q "^avahi:" /etc/group ; then +if ! getent group avahi &>/dev/null; then warn_accounts fi -if [ "${ARCH}" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "${ARCH}" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" |