diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-24 16:42:26 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-24 16:42:26 +0200 |
commit | cbdfc3b84ec5a246b83fb991fd865754b841f9c5 (patch) | |
tree | 19c96c6cd337984249264b43d548100260a3e857 /mk/pkg-bottom.mk | |
parent | 36b8021619c7f7a8ec6fee10e3bfa6e7ff8d9d48 (diff) | |
parent | ba1dbc96f36abce072ac39a33bb0bd85e12a4e97 (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'mk/pkg-bottom.mk')
-rw-r--r-- | mk/pkg-bottom.mk | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk index a3b42f915..f0af93810 100644 --- a/mk/pkg-bottom.mk +++ b/mk/pkg-bottom.mk @@ -17,7 +17,7 @@ PKG_LIBNAME?= $(PKG_NAME) pre-configure: do-configure: post-configure: -${_CONFIGURE_COOKIE}: ${_PATCH_COOKIE} +${_CONFIGURE_COOKIE}: ${_HOST_COOKIE} ${_PATCH_COOKIE} @sed -e '/^#/d' ${REORDER_DEPENDENCIES} | \ tsort | while read f; do \ cd ${WRKSRC}; \ @@ -169,15 +169,15 @@ ifeq (,$(filter noremove,${PKG_OPTS})) endif @rm -f '${STAGING_PKG_DIR}/${PKG_NAME}' ifneq (,$(filter dev,${PKG_OPTS})) - mkdir -p $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(PKG_LIBNAME)-dev/usr/include - test -d ${WRKINST}/usr/include && cd ${WRKINST}/usr/include; \ + @mkdir -p $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(PKG_LIBNAME)-dev/usr/include + @test -d ${WRKINST}/usr/include && cd ${WRKINST}/usr/include; \ find . -name \*.h | \ $(TOOLS_DIR)/cpio -padlmu $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(PKG_LIBNAME)-dev/usr/include - mkdir -p $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(PKG_LIBNAME)-dev/usr/lib/pkgconfig - test -d ${WRKINST}/usr/lib/pkgconfig && cd ${WRKINST}/usr/lib/pkgconfig; \ + @mkdir -p $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(PKG_LIBNAME)-dev/usr/lib/pkgconfig + @test -d ${WRKINST}/usr/lib/pkgconfig && cd ${WRKINST}/usr/lib/pkgconfig; \ find . -name \*.pc | \ $(TOOLS_DIR)/cpio -padlmu $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(PKG_LIBNAME)-dev/usr/lib/pkgconfig - for a in ${WRKINST}/usr/bin/*-config*; do \ + @for a in ${WRKINST}/usr/bin/*-config*; do \ [[ -e $$a ]] || continue; \ mkdir -p $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(PKG_LIBNAME)-dev/usr/bin; \ cp $$a $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(PKG_LIBNAME)-dev/usr/bin; \ |