|
@@ -20,18 +20,19 @@ ${_HOST_CONFIGURE_COOKIE}: ${_HOST_PATCH_COOKIE}
|
|
${CP} ${SCRIPT_DIR}/config.guess $$i; \
|
|
${CP} ${SCRIPT_DIR}/config.guess $$i; \
|
|
fi; \
|
|
fi; \
|
|
done;
|
|
done;
|
|
-ifneq ($(filter auto,${HOST_STYLE}),)
|
|
+ifeq ($(strip ${HOST_STYLE}),)
|
|
cd ${WRKBUILD}; rm -f config.{cache,status}; \
|
|
cd ${WRKBUILD}; rm -f config.{cache,status}; \
|
|
env ${HOST_CONFIGURE_ENV} \
|
|
env ${HOST_CONFIGURE_ENV} \
|
|
${BASH} ${WRKSRC}/${CONFIGURE_PROG} \
|
|
${BASH} ${WRKSRC}/${CONFIGURE_PROG} \
|
|
--program-prefix= \
|
|
--program-prefix= \
|
|
--program-suffix= \
|
|
--program-suffix= \
|
|
- --prefix=${STAGING_HOST_DIR}/usr \
|
|
+ --prefix=/usr \
|
|
- --bindir=${STAGING_HOST_DIR}/usr/bin \
|
|
+ --bindir=/usr/bin \
|
|
- --datadir=${STAGING_HOST_DIR}/usr/share \
|
|
+ --datadir=/usr/share \
|
|
- --mandir=${STAGING_HOST_DIR}/usr/share/man \
|
|
+ --mandir=/usr/share/man \
|
|
- --libexecdir=${STAGING_HOST_DIR}/usr/libexec \
|
|
+ --libexecdir=/usr/libexec \
|
|
- --sysconfdir=${STAGING_HOST_DIR}/etc \
|
|
+ --localstatedir=/var \
|
|
|
|
+ --sysconfdir=/etc \
|
|
--disable-dependency-tracking \
|
|
--disable-dependency-tracking \
|
|
--disable-libtool-lock \
|
|
--disable-libtool-lock \
|
|
--disable-nls \
|
|
--disable-nls \
|
|
@@ -42,13 +43,12 @@ else
|
|
${BASH} ${WRKSRC}/${CONFIGURE_PROG} \
|
|
${BASH} ${WRKSRC}/${CONFIGURE_PROG} \
|
|
--program-prefix= \
|
|
--program-prefix= \
|
|
--program-suffix= \
|
|
--program-suffix= \
|
|
- --prefix=/usr \
|
|
+ --prefix=${STAGING_HOST_DIR}/usr \
|
|
- --bindir=/usr/bin \
|
|
+ --bindir=${STAGING_HOST_DIR}/usr/bin \
|
|
- --datadir=/usr/share \
|
|
+ --datadir=${STAGING_HOST_DIR}/usr/share \
|
|
- --mandir=/usr/share/man \
|
|
+ --mandir=${STAGING_HOST_DIR}/usr/share/man \
|
|
- --libexecdir=/usr/libexec \
|
|
+ --libexecdir=${STAGING_HOST_DIR}/usr/libexec \
|
|
- --localstatedir=/var \
|
|
+ --sysconfdir=${STAGING_HOST_DIR}/etc \
|
|
- --sysconfdir=/etc \
|
|
|
|
--disable-dependency-tracking \
|
|
--disable-dependency-tracking \
|
|
--disable-libtool-lock \
|
|
--disable-libtool-lock \
|
|
--disable-nls \
|
|
--disable-nls \
|
|
@@ -67,13 +67,13 @@ hpkg-install: ${ALL_HOSTINST}
|
|
host-install:
|
|
host-install:
|
|
${_HOST_FAKE_COOKIE}: ${_HOST_BUILD_COOKIE}
|
|
${_HOST_FAKE_COOKIE}: ${_HOST_BUILD_COOKIE}
|
|
@$(CMD_TRACE) "host installing... "
|
|
@$(CMD_TRACE) "host installing... "
|
|
-ifneq ($(filter auto,${HOST_STYLE}),)
|
|
+ifeq ($(strip ${HOST_STYLE}),)
|
|
- cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \
|
|
|
|
- DESTDIR='' ${HOST_FAKE_FLAGS} ${HOST_INSTALL_TARGET} $(MAKE_TRACE)
|
|
|
|
-else
|
|
|
|
cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \
|
|
cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \
|
|
DESTDIR='${HOST_WRKINST}' ${HOST_FAKE_FLAGS} ${HOST_INSTALL_TARGET} $(MAKE_TRACE)
|
|
DESTDIR='${HOST_WRKINST}' ${HOST_FAKE_FLAGS} ${HOST_INSTALL_TARGET} $(MAKE_TRACE)
|
|
env ${HOST_MAKE_ENV} ${MAKE} hpkg-install $(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
|
|
endif
|
|
rm -rf ${WRKBUILD} ${WRKDIST} ${WRKSRC}
|
|
rm -rf ${WRKBUILD} ${WRKDIST} ${WRKSRC}
|
|
exec ${MAKE} host-extract $(MAKE_TRACE)
|
|
exec ${MAKE} host-extract $(MAKE_TRACE)
|