summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2015-01-14 15:26:58 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2015-01-14 15:26:58 +0000
commita6150cc7e064f009537e4a3a444a9eb83c667113 (patch)
treeb64195e6547a19315c9bbe0a5a68f7b8a96491db
parenta5caab30c9cc5ea5209f5394f456d9f9b42717a6 (diff)
downloadabuild-a6150cc7e064f009537e4a3a444a9eb83c667113.tar.gz
abuild-a6150cc7e064f009537e4a3a444a9eb83c667113.tar.bz2
abuild-a6150cc7e064f009537e4a3a444a9eb83c667113.tar.xz
abuild-a6150cc7e064f009537e4a3a444a9eb83c667113.zip
abuild: fix move of .a file to -dev subpackage
seems like new version of busybox find would stop if lib/ dir does not exist.
-rw-r--r--abuild.in4
1 files changed, 3 insertions, 1 deletions
diff --git a/abuild.in b/abuild.in
index e4e5091..68f6afd 100644
--- a/abuild.in
+++ b/abuild.in
@@ -1294,6 +1294,8 @@ default_dev() {
done
cd "$pkgdir" || return 0
+ local libdirs=usr/
+ [ -d lib/ ] && libdirs="lib/ $libdirs"
for i in usr/include usr/lib/pkgconfig usr/share/aclocal\
usr/share/gettext usr/bin/*-config \
usr/share/vala/vapi usr/share/gir-[0-9]*\
@@ -1301,7 +1303,7 @@ default_dev() {
usr/lib/qt*/mkspecs \
usr/lib/cmake \
$(find . -name include -type d) \
- $(find lib/ usr/ -name '*.[acho]' \
+ $(find $libdirs -name '*.[acho]' \
-o -name '*.prl' 2>/dev/null); do
if [ -e "$pkgdir/$i" ] || [ -L "$pkgdir/$i" ]; then
d="$subpkgdir/${i%/*}" # dirname $i