diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-08 19:56:21 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-08 19:56:21 +0100 |
| commit | 18aa85857ca8fa9d75d41c36665a1cb7e8bbda5c (patch) | |
| tree | a125dee1ba0256ccdb5a7e440e7ee97dbcf67671 /mk | |
| parent | 422beddb9dcf0a67afe92e70f3afef6baed6a4b0 (diff) | |
variable name cleanup
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/package.mk | 2 | ||||
| -rw-r--r-- | mk/pkg-bottom.mk | 2 | ||||
| -rw-r--r-- | mk/vars.mk | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/mk/package.mk b/mk/package.mk index 59fb6a805..d9d10c79d 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -219,7 +219,7 @@ endif find usr ! -type d 2>/dev/null | \ grep -v -e '^usr/share' -e '^usr/man' -e '^usr/info' -e '^usr/lib/libc.so' | \ tee '$${STAGING_PKG_DIR}/$(1)' | \ - $(TOPDIR)/bin/tools/cpio -padlmu '$${STAGING_TARGET_DIR}' + $(TOOLS_DIR)/cpio -padlmu '$${STAGING_TARGET_DIR}' @cd '$${STAGING_TARGET_DIR}'; grep 'usr/lib/.*\.la$$$$' \ '$${STAGING_PKG_DIR}/$(1)' | while read fn; do \ chmod u+w $$$$fn; \ diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk index 6e5fdc3a5..f91e1bb45 100644 --- a/mk/pkg-bottom.mk +++ b/mk/pkg-bottom.mk @@ -170,7 +170,7 @@ endif find usr ! -type d 2>/dev/null | \ grep -v -e '^usr/share' -e '^usr/man' -e '^usr/info' -e '^usr/lib/libc.so' | \ tee '${STAGING_PKG_DIR}/${PKG_NAME}' | \ - $(TOPDIR)/bin/tools/cpio -padlmu '${STAGING_TARGET_DIR}' + $(TOOLS_DIR)/cpio -padlmu '${STAGING_TARGET_DIR}' @cd '${STAGING_TARGET_DIR}'; grep 'usr/lib/.*\.la$$' \ '${STAGING_PKG_DIR}/${PKG_NAME}' | while read fn; do \ chmod u+w $$fn; \ diff --git a/mk/vars.mk b/mk/vars.mk index b376140ed..37461e981 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -108,19 +108,19 @@ EXTRACT_CMD= mkdir -p ${WRKDIR}; \ cd ${WRKDIR} && \ for file in ${FULLDISTFILES}; do case $$file in \ *.cpio) \ - cat $$file | $(TOPDIR)/bin/tools/cpio -i -d ;; \ + cat $$file | $(TOOLS_DIR)/cpio -i -d ;; \ *.tar) \ tar -xf $$file ;; \ *.cpio.Z | *.cpio.gz | *.cgz | *.mcz) \ - gzip -dc $$file | $(TOPDIR)/bin/tools/cpio -i -d ;; \ + gzip -dc $$file | $(TOOLS_DIR)/cpio -i -d ;; \ *.tar.Z | *.tar.gz | *.taz | *.tgz) \ gzip -dc $$file | tar -xf - ;; \ *.cpio.bz2 | *.cbz) \ - bzip2 -dc $$file | $(TOPDIR)/bin/tools/cpio -i -d ;; \ + bzip2 -dc $$file | $(TOOLS_DIR)/cpio -i -d ;; \ *.tar.bz2 | *.tbz | *.tbz2) \ bzip2 -dc $$file | tar -xf - ;; \ *.zip) \ - cat $$file | $(TOPDIR)/bin/tools/cpio -ivd -H zip ;; \ + cat $$file | $(TOOLS_DIR)/cpio -ivd -H zip ;; \ *.arm) \ cp $$file ${WRKDIR} ;; \ *) \ |