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/xcb-proto/Makefile | |
| parent | ed3d91cf2dfc6f63ae749b54c7d718eb73dd6211 (diff) | |
| parent | 6e58f05aaae4943de494bc30dd3bf184a6d676f2 (diff) | |
resolve conflict
Diffstat (limited to 'package/xcb-proto/Makefile')
| -rw-r--r-- | package/xcb-proto/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/package/xcb-proto/Makefile b/package/xcb-proto/Makefile index eca8ab4f5..9e5d2b3b1 100644 --- a/package/xcb-proto/Makefile +++ b/package/xcb-proto/Makefile @@ -27,16 +27,16 @@ include $(TOPDIR)/mk/python.mk HOST_STYLE:= auto CONFIGURE_ENV+= PYTHON=$(PYTHON) -CONFIGURE_ARGS+= --datadir=${STAGING_DIR}/usr/share +CONFIGURE_ARGS+= --datadir=${STAGING_TARGET_DIR}/usr/share post-build: ${INSTALL_DIR} ${STAGING_TARGET_DIR}/usr/share/xcb ${CP} ${WRKBUILD}/src/*.xml ${STAGING_TARGET_DIR}/usr/share/xcb xcb-python-install: - $(INSTALL_DIR) ${STAGING_DIR}/usr/lib/python${PYTHON_VERSION}/site-packages/xcbgen + $(INSTALL_DIR) ${STAGING_TARGET_DIR}/usr/lib/python${PYTHON_VERSION}/site-packages/xcbgen ${CP} ${WRKINST}/usr/lib/python${PYTHON_VERSION}/site-packages/xcbgen/*.py \ - ${STAGING_DIR}/usr/lib/python${PYTHON_VERSION}/site-packages/xcbgen + ${STAGING_TARGET_DIR}/usr/lib/python${PYTHON_VERSION}/site-packages/xcbgen ${INSTALL_DIR} ${IDIR_XCB_PYTHON}/usr/lib/python${PYTHON_VERSION}/site-packages/xcbgen ${CP} ${WRKINST}/usr/lib/python${PYTHON_VERSION}/site-packages/xcbgen/*.py \ ${IDIR_XCB_PYTHON}/usr/lib/python${PYTHON_VERSION}/site-packages/xcbgen |