diff options
Diffstat (limited to 'mk/package.mk')
| -rw-r--r-- | mk/package.mk | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/mk/package.mk b/mk/package.mk index c0b5c04e6..9f40c337a 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -173,7 +173,7 @@ endif done @mkdir -p $${PACKAGE_DIR} '$${STAGING_PARENT}/pkg' \ '$${STAGING_DIR}/scripts' -ifneq ($(strip $(7)),noremove) +ifeq (,$(filter noremove,$(7))) if test -s '$${STAGING_PARENT}/pkg/$(1)'; then \ cd '$${STAGING_DIR}'; \ while read fn; do \ @@ -200,7 +200,10 @@ endif '$${STAGING_PARENT}/pkg/$(1)' | while read fn; do \ chmod u+w $$$$fn; \ $(SED) "s,\(^libdir='\| \|-L\|^dependency_libs='\)/usr/lib,\1$(STAGING_DIR)/usr/lib,g" $$fn; \ - done; grep 'usr/s*bin/' '$${STAGING_PARENT}/pkg/$(1)' | \ + done +ifeq (,$(filter noscripts,$(7))) + cd '$${STAGING_DIR}'; grep 'usr/s*bin/' \ + '$${STAGING_PARENT}/pkg/$(1)' | \ while read fn; do \ b="$$$$(dd if="$$$$fn" bs=2 count=1 2>/dev/null)"; \ [[ $$$$b = '#!' ]] || continue; \ @@ -208,12 +211,13 @@ endif echo "scripts/$$$$(basename "$$$$fn")" \ >>'$${STAGING_PARENT}/pkg/$(1)'; \ done +endif $${IPKG_BUILD} $${IDIR_$(1)} $${PACKAGE_DIR} $(MAKE_TRACE) clean-targets: clean-dev-$(1) clean-dev-$(1): -ifneq ($(strip $(7)),noremove) +ifeq (,$(filter noremove,$(7))) if test -s '$${STAGING_PARENT}/pkg/$(1)'; then \ cd '$${STAGING_DIR}'; \ while read fn; do \ |