summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2012-10-02 14:46:50 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2012-10-02 14:46:50 +0200
commitfce33d947d6cc5b8d8b3095503a82568294c1ebe (patch)
tree1797abe4c5b14c4e7af32fc88bc5627a03954750
parentade3509991388339b04a86806ea979ee0eda2ee4 (diff)
handle libIDL-config-2
-rw-r--r--mk/pkg-bottom.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk
index 954539764..6704c1abc 100644
--- a/mk/pkg-bottom.mk
+++ b/mk/pkg-bottom.mk
@@ -142,7 +142,7 @@ else
@echo "Invalid INSTALL_STYLE '${INSTALL_STYLE}'" >&2
@exit 1
endif
- @for a in ${WRKINST}/usr/bin/*-config; do \
+ @for a in ${WRKINST}/usr/bin/*-config*; do \
[[ -e $$a ]] || continue; \
sed -e "s,^prefix=.*,prefix=${STAGING_TARGET_DIR}/usr," $$a > \
${STAGING_DIR}/usr/bin/$$(basename $$a); \
@@ -172,7 +172,7 @@ endif
-exec echo 'WARNING: ${PKG_NAME} installs files in /lib -' \
' fix this!' >&2 \; -quit 2>/dev/null; fi;\
find usr ! -type d 2>/dev/null | \
- grep -E -v -e '^usr/lib/pkgconfig' -e '^usr/share' -e '^usr/src' -e '^usr/doc' -e '^usr/local' -e '^usr/man' -e '^usr/info' -e '^usr/lib/libc.so' -e '^usr/bin/[a-z0-9-]+-config' -e '^/usr/lib/libpthread_nonshared.a' | \
+ grep -E -v -e '^usr/lib/pkgconfig' -e '^usr/share' -e '^usr/src' -e '^usr/doc' -e '^usr/local' -e '^usr/man' -e '^usr/info' -e '^usr/lib/libc.so' -e '^usr/bin/[a-z0-9-]+-config*' -e '^/usr/lib/libpthread_nonshared.a' | \
tee '${STAGING_PKG_DIR}/${PKG_NAME}' | \
$(TOOLS_DIR)/cpio -padlmu '${STAGING_DIR}'
@cd '${STAGING_DIR}'; grep 'usr/lib/.*\.la$$' \