diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-03-28 23:22:47 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-03-28 23:22:47 +0200 |
| commit | 02fa287d32bea0c3c92e370c919c08138884fa67 (patch) | |
| tree | 625addc5a18d64db5bf802f86a8125175562d04e /mk | |
| parent | 2e006cc96290a7728df34a6c8e8396435e8a8c5f (diff) | |
| parent | eb443d5b254293f18479b3e84043ebe3958ad545 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/package.mk | 2 | ||||
| -rw-r--r-- | mk/pkg-bottom.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mk/package.mk b/mk/package.mk index f397974d8..6c58d4d4e 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -216,7 +216,7 @@ endif -exec echo 'WARNING: $${IPKG_$(1)} installs files in /lib -' \ ' fix this!' >&2 \; -quit 2>/dev/null; fi; \ find usr ! -type d 2>/dev/null | \ - grep -v -e '^usr/share' -e '^usr/man' -e '^usr/info' | \ + grep -v -e '^usr/share' -e '^usr/man' -e '^usr/info' -e '^usr/lib/libc.so' | \ tee '$${STAGING_PARENT}/pkg/$(1)' | \ cpio -padlmu '$${STAGING_DIR}' @cd '$${STAGING_DIR}'; grep 'usr/lib/.*\.la$$$$' \ diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk index d78cc5876..466a4c398 100644 --- a/mk/pkg-bottom.mk +++ b/mk/pkg-bottom.mk @@ -164,7 +164,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 -v -e '^usr/share' -e '^usr/man' -e '^usr/info' | \ + grep -v -e '^usr/share' -e '^usr/man' -e '^usr/info' -e '^usr/lib/libc.so' | \ tee '${STAGING_PARENT}/pkg/${PKG_NAME}' | \ cpio -padlmu '${STAGING_DIR}' @cd '${STAGING_DIR}'; grep 'usr/lib/.*\.la$$' \ |