diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-10 16:29:28 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-10 16:29:28 +0100 |
commit | 39aef29414d77492e06d872cfeaf4ba744fa9d38 (patch) | |
tree | 708ee5f6f46f5bd2db6c4ec1cce2a1922df4076a /package/boost | |
parent | ed3d91cf2dfc6f63ae749b54c7d718eb73dd6211 (diff) | |
parent | 6e58f05aaae4943de494bc30dd3bf184a6d676f2 (diff) |
resolve conflict
Diffstat (limited to 'package/boost')
-rw-r--r-- | package/boost/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package/boost/Makefile b/package/boost/Makefile index 2951c1e8c..a2a92df00 100644 --- a/package/boost/Makefile +++ b/package/boost/Makefile @@ -57,7 +57,7 @@ CONFIGURE_ARGS += \ CONFIGURE_ARGS+=--without-locale ifneq (${ADK_PACKAGE_BOOST_IOSTREAMS},) - CONFIGURE_ARGS += -sNO_BZIP2=1 -sZLIB_INCLUDE=${STAGING_DIR}/usr/include -sZLIB_LIBPATH=${STAGING_DIR}/usr/lib + CONFIGURE_ARGS += -sNO_BZIP2=1 -sZLIB_INCLUDE=${STAGING_TARGET_DIR}/usr/include -sZLIB_LIBPATH=${STAGING_TARGET_DIR}/usr/lib else CONFIGURE_ARGS += --without-iostreams endif |