diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-09-16 13:10:39 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-09-16 13:10:39 +0200 |
| commit | 9a625cd021c2d087a988699dcfc3e512fa163235 (patch) | |
| tree | 2fbdefdee370f2cd2c5ee76ec62b9dd9b65cbd9c /mk/vars.mk | |
| parent | afab289b265ff987c3f62393b3ef707c2650704f (diff) | |
| parent | 4422cda575db22275b067e07ad4b585572d91756 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
mk/kernel-build.mk
package/expat/Makefile
package/gettext/Makefile
package/perl/Makefile
package/zlib/Makefile
Diffstat (limited to 'mk/vars.mk')
| -rw-r--r-- | mk/vars.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mk/vars.mk b/mk/vars.mk index 6f38db944..40226b254 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -102,7 +102,7 @@ EXTRACT_CMD= mkdir -p ${WRKDIR}; \ cd ${WRKDIR} && \ for file in ${FULLDISTFILES}; do case $$file in \ *.cpio) \ - cat $$file | $(STAGING_TOOLS)/bin/cpio -i -d ;; \ + cat $$file | $(TOPDIR)/bin/tools/cpio -i -d ;; \ *.tar) \ tar -xf $$file ;; \ *.cpio.Z | *.cpio.gz | *.cgz | *.mcz) \ @@ -114,7 +114,7 @@ EXTRACT_CMD= mkdir -p ${WRKDIR}; \ *.tar.bz2 | *.tbz | *.tbz2) \ bzip2 -dc $$file | tar -xf - ;; \ *.zip) \ - cat $$file | $(STAGING_TOOLS)/bin/cpio -ivd -H zip ;; \ + cat $$file | $(TOPDIR)/bin/tools/cpio -ivd -H zip ;; \ *.arm) \ cp $$file ${WRKDIR} ;; \ *) \ |