diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-02-18 11:28:02 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-02-18 11:28:02 +0100 |
| commit | f9e8a355d7ff88bae17ea9f2198fbf3f990cd1bc (patch) | |
| tree | 03d4c73e81a736a0d1a37130eb8e2ee0b3471148 /mk/package.mk | |
| parent | da133cad10885ca36be26b1b043c737e295a4cd4 (diff) | |
use bin directory for host binaries only, use new firmware directory for the resulting firmware
Diffstat (limited to 'mk/package.mk')
| -rw-r--r-- | mk/package.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mk/package.mk b/mk/package.mk index da04288c1..b9b198e57 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -78,7 +78,7 @@ _PATCH_COOKIE= ${WRKDIST}/.prepared _CONFIGURE_COOKIE= ${WRKBUILD}/.configure_done _BUILD_COOKIE= ${WRKBUILD}/.build_done _FAKE_COOKIE= ${WRKINST}/.fake_done -_IPKGS_COOKIE= ${PACKAGE_DIR}/.stamps/${PKG_NAME}${PKG_VERSION}-${PKG_RELEASE} +_IPKGS_COOKIE= ${STAGING_PKG_DIR}/${PKG_NAME}${PKG_VERSION}-${PKG_RELEASE} _IN_PACKAGE:= 1 include ${TOPDIR}/mk/buildhlp.mk @@ -249,7 +249,7 @@ endif find usr ! -type d 2>/dev/null | \ grep -E -v -e '^usr/lib/pkgconfig' -e '^usr/share' -e '^usr/doc' -e '^usr/src' -e '^usr/man' -e '^usr/info' -e '^usr/lib/libc.so' -e '^usr/bin/[a-z0-9-]+-config' | \ tee '$${STAGING_PKG_DIR}/$(1)' | \ - $(TOOLS_DIR)/cpio -padlmu '$${STAGING_DIR}' + $(BIN_DIR)/cpio -padlmu '$${STAGING_DIR}' @cd '$${STAGING_DIR}'; grep 'usr/lib/.*\.la$$$$' \ '$${STAGING_PKG_DIR}/$(1)' | while read fn; do \ chmod u+w $$$$fn; \ @@ -321,7 +321,7 @@ clean-targets: clean: @$(CMD_TRACE) "cleaning... " @$(MAKE) clean-targets $(MAKE_TRACE) - rm -rf ${WRKDIR} ${ALL_IPKGS} ${PACKAGE_DIR}/.stamps/${PKG_NAME}* + rm -rf ${WRKDIR} ${ALL_IPKGS} ${STAGING_PKG_DIR}/${PKG_NAME}* distclean: clean rm -f ${FULLDISTFILES} |