diff options
Diffstat (limited to 'network/openresolv/openresolv.SlackBuild')
| -rw-r--r-- | network/openresolv/openresolv.SlackBuild | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/network/openresolv/openresolv.SlackBuild b/network/openresolv/openresolv.SlackBuild index 61e7e7eef09d3..5e4735da16e0d 100644 --- a/network/openresolv/openresolv.SlackBuild +++ b/network/openresolv/openresolv.SlackBuild @@ -3,6 +3,7 @@ # Slackware build script for openresolv # Copyright 2012-2013 synbq Bucharest +# Copyright 2017 Jeremy Hansen <jebrhansen+SBo -at- gmail.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +25,7 @@ PRGNAM=openresolv VERSION=${VERSION:-3.9.0} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -40,16 +41,10 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -# Enable OPENVPN - Defaulting to no -if [ "${OPENVPN:-no}" = "no" ]; then - USE_OPENVPN="" -else - if [ -d /etc/openvpn ]; then - USE_OPENVPN="install -m755 $CWD/update-resolv-conf $PKG/etc/openvpn/" - else +# If building openvpn support, ensure it's installed +if [ "${OPENVPN:-no}" = "yes" ] && [ ! -d /etc/openvpn ]; then echo "You must to have openvpn installed" exit 1 - fi fi if [ "$ARCH" = "i586" ]; then @@ -85,7 +80,7 @@ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ + --libexecdir=/usr/libexec/openresolv \ --sysconfdir=/etc \ --localstatedir=/var \ --mandir=/usr/man \ @@ -94,10 +89,6 @@ CXXFLAGS="$SLKCFLAGS" \ make make install DESTDIR=$PKG -if [ "$ARCH" = "x86_64" ]; then - mv $PKG/usr/lib $PKG/usr/lib${LIBDIRSUFFIX} -fi - find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true @@ -110,7 +101,7 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild if [ "${OPENVPN}" = "yes" ]; then mkdir -p $PKG/etc/openvpn - $USE_OPENVPN + install -m 0755 $CWD/update-resolv-conf $PKG/etc/openvpn/update-resolv-conf.new fi mv $PKG/etc/resolvconf.conf $PKG/etc/resolvconf.conf.new |