summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2015-06-13 21:59:06 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2015-06-13 21:59:50 +0200
commitce2eb8f92671ec426c996baca1ef9931c3bacb68 (patch)
treed3a885bbd94a72a4f486b3b51b6cebb049bc1672 /mk
parent6c85bf610d803db0183faa02ffebbf1f48c318c2 (diff)
a lot of bugfixes and package updates
Diffstat (limited to 'mk')
-rw-r--r--mk/build.mk3
-rw-r--r--mk/host-bottom.mk2
2 files changed, 4 insertions, 1 deletions
diff --git a/mk/build.mk b/mk/build.mk
index 798856cf8..058a7e8f1 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -187,12 +187,13 @@ ifeq ($(ADK_TARGET_PACKAGE_OPKG),y)
endif
${STAGING_TARGET_DIR} ${STAGING_TARGET_DIR}/etc ${STAGING_HOST_DIR}:
- echo ${STAGING_TARGET_DIR}
@mkdir -p ${STAGING_TARGET_DIR}/{bin,etc,lib,usr/bin,usr/include,usr/lib/pkgconfig} \
${STAGING_HOST_DIR}/{usr/bin,usr/lib,usr/include}
@for i in lib64 lib32 libx32;do \
cd ${STAGING_TARGET_DIR}/; ln -sf lib $$i; \
cd ${STAGING_TARGET_DIR}/usr; ln -sf lib $$i; \
+ cd ${STAGING_HOST_DIR}/; ln -sf lib $$i; \
+ cd ${STAGING_HOST_DIR}/usr; ln -sf lib $$i; \
done
${STAGING_TARGET_DIR}/etc/ipkg.conf: ${STAGING_TARGET_DIR}/etc
diff --git a/mk/host-bottom.mk b/mk/host-bottom.mk
index 303e3a93c..caba52f3e 100644
--- a/mk/host-bottom.mk
+++ b/mk/host-bottom.mk
@@ -39,6 +39,7 @@ ifeq (${HOST_STYLE},)
--bindir=${STAGING_HOST_DIR}/usr/bin \
--datadir=${STAGING_HOST_DIR}/usr/share \
--mandir=${STAGING_HOST_DIR}/usr/share/man \
+ --libdir=${STAGING_HOST_DIR}/usr/lib \
--libexecdir=${STAGING_HOST_DIR}/usr/libexec \
--sysconfdir=${STAGING_HOST_DIR}/etc \
--disable-dependency-tracking \
@@ -56,6 +57,7 @@ ifeq (${HOST_STYLE},auto)
--bindir=/usr/bin \
--datadir=/usr/share \
--mandir=/usr/share/man \
+ --libdir=/usr/lib \
--libexecdir=/usr/libexec \
--localstatedir=/var \
--sysconfdir=/etc \