diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-30 16:01:06 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-30 16:01:06 +0100 |
| commit | c3c50b45244d5c94e1b880b37c3da202ed70fceb (patch) | |
| tree | b76a992fe898a1e4e71ded2b4c0dded78cd4bd8a /mk/host-bottom.mk | |
| parent | fdeed9b0c762e9f700f3e45869ec58057da449a1 (diff) | |
| parent | 61cc800e46cc943824dc6a0b8e8d413f2795db9f (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'mk/host-bottom.mk')
| -rw-r--r-- | mk/host-bottom.mk | 39 |
1 files changed, 19 insertions, 20 deletions
diff --git a/mk/host-bottom.mk b/mk/host-bottom.mk index 327883a95..83eb22b0e 100644 --- a/mk/host-bottom.mk +++ b/mk/host-bottom.mk @@ -20,36 +20,35 @@ ${_HOST_CONFIGURE_COOKIE}: ${_HOST_PATCH_COOKIE} ${CP} ${SCRIPT_DIR}/config.guess $$i; \ fi; \ done; -ifneq ($(filter auto,${HOST_STYLE}),) +ifeq ($(strip ${HOST_STYLE}),) cd ${WRKBUILD}; rm -f config.{cache,status}; \ env ${HOST_CONFIGURE_ENV} \ ${BASH} ${WRKSRC}/${CONFIGURE_PROG} \ --program-prefix= \ --program-suffix= \ - --prefix=${STAGING_HOST_DIR}/usr \ - --bindir=${STAGING_HOST_DIR}/usr/bin \ - --datadir=${STAGING_HOST_DIR}/usr/share \ - --mandir=${STAGING_HOST_DIR}/usr/share/man \ - --libexecdir=${STAGING_HOST_DIR}/usr/libexec \ - --sysconfdir=${STAGING_HOST_DIR}/etc \ + --prefix=/usr \ + --bindir=/usr/bin \ + --datadir=/usr/share \ + --mandir=/usr/share/man \ + --libexecdir=/usr/libexec \ + --localstatedir=/var \ + --sysconfdir=/etc \ --disable-dependency-tracking \ --disable-libtool-lock \ --disable-nls \ ${HOST_CONFIGURE_ARGS} $(MAKE_TRACE) - else cd ${WRKBUILD}; rm -f config.{cache,status}; \ env ${HOST_CONFIGURE_ENV} \ ${BASH} ${WRKSRC}/${CONFIGURE_PROG} \ --program-prefix= \ --program-suffix= \ - --prefix=/usr \ - --bindir=/usr/bin \ - --datadir=/usr/share \ - --mandir=/usr/share/man \ - --libexecdir=/usr/libexec \ - --localstatedir=/var \ - --sysconfdir=/etc \ + --prefix=${STAGING_HOST_DIR}/usr \ + --bindir=${STAGING_HOST_DIR}/usr/bin \ + --datadir=${STAGING_HOST_DIR}/usr/share \ + --mandir=${STAGING_HOST_DIR}/usr/share/man \ + --libexecdir=${STAGING_HOST_DIR}/usr/libexec \ + --sysconfdir=${STAGING_HOST_DIR}/etc \ --disable-dependency-tracking \ --disable-libtool-lock \ --disable-nls \ @@ -68,20 +67,20 @@ hpkg-install: ${ALL_HOSTINST} host-install: ${_HOST_FAKE_COOKIE}: ${_HOST_BUILD_COOKIE} @$(CMD_TRACE) "host installing... " -ifneq ($(filter auto,${HOST_STYLE}),) - cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \ - DESTDIR='' ${HOST_FAKE_FLAGS} ${HOST_INSTALL_TARGET} $(MAKE_TRACE) -else +ifeq ($(strip ${HOST_STYLE}),) cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \ DESTDIR='${HOST_WRKINST}' ${HOST_FAKE_FLAGS} ${HOST_INSTALL_TARGET} $(MAKE_TRACE) env ${HOST_MAKE_ENV} ${MAKE} hpkg-install $(MAKE_TRACE) +else + cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \ + DESTDIR='' ${HOST_FAKE_FLAGS} ${HOST_INSTALL_TARGET} $(MAKE_TRACE) endif rm -rf ${WRKBUILD} ${WRKDIST} ${WRKSRC} exec ${MAKE} host-extract $(MAKE_TRACE) mkdir -p ${HOST_WRKINST} - touch $@ # avoid rebuild touch ${_HOST_BUILD_COOKIE} ${_HOST_CONFIGURE_COOKIE} + touch $@ ${_HOST_COOKIE}: exec ${MAKE} hostpackage |