diff options
| author | Sören Tempel <soeren+git@soeren-tempel.net> | 2017-08-10 14:19:53 +0200 |
|---|---|---|
| committer | Sören Tempel <soeren+git@soeren-tempel.net> | 2017-08-10 14:19:53 +0200 |
| commit | 33417a9efacb7614e25bc6a6b93ad8a5444640a7 (patch) | |
| tree | 0b5125e90df6ce29b9a93717f327c44cf6d81b3c /main/iproute2/APKBUILD | |
| parent | deb1c0183c25f18e50e7a98fd501a697d5ff631a (diff) | |
| download | aports-33417a9efacb7614e25bc6a6b93ad8a5444640a7.tar.bz2 aports-33417a9efacb7614e25bc6a6b93ad8a5444640a7.tar.xz | |
main/iproute2: modernize APKBUILD
Diffstat (limited to 'main/iproute2/APKBUILD')
| -rw-r--r-- | main/iproute2/APKBUILD | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/main/iproute2/APKBUILD b/main/iproute2/APKBUILD index 3feef4c187..00dfd6cd59 100644 --- a/main/iproute2/APKBUILD +++ b/main/iproute2/APKBUILD @@ -17,13 +17,13 @@ builddir="$srcdir"/$pkgname-$_realver patch_args="-p0" prepare() { - default_prepare || return 1 + default_prepare cd "$builddir" sed -i '/^TARGETS=/s: arpd : :' misc/Makefile - sed -i 's:/usr/local:/usr:' tc/m_ipt.c include/iptables.h || return 1 + sed -i 's:/usr/local:/usr:' tc/m_ipt.c include/iptables.h sed -i -e 's:=/share:=/usr/share:' \ - -e 's:-Werror::' Makefile || return 1 + -e 's:-Werror::' Makefile } build() { @@ -34,14 +34,13 @@ build() { --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ - --localstatedir=/var \ - || return 1 - make CCOPTS="-D_GNU_SOURCE $CFLAGS" LIBDIR=/lib || return 1 + --localstatedir=/var + make CCOPTS="-D_GNU_SOURCE $CFLAGS" LIBDIR=/lib } package() { cd "$builddir" - make -j1 DESTDIR="$pkgdir" install || return 1 + make -j1 DESTDIR="$pkgdir" install } bashcomp() { @@ -51,7 +50,7 @@ bashcomp() { mkdir -p "$subpkgdir"/usr/share/ mv "$pkgdir"/usr/share/bash-completion \ - "$subpkgdir"/usr/share || return 1 + "$subpkgdir"/usr/share rmdir -p "$pkgdir"/usr/share 2>/dev/null || true } |