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/tinyxml/Makefile | |
| parent | ed3d91cf2dfc6f63ae749b54c7d718eb73dd6211 (diff) | |
| parent | 6e58f05aaae4943de494bc30dd3bf184a6d676f2 (diff) | |
resolve conflict
Diffstat (limited to 'package/tinyxml/Makefile')
| -rw-r--r-- | package/tinyxml/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package/tinyxml/Makefile b/package/tinyxml/Makefile index 0af10f763..568cc1071 100644 --- a/package/tinyxml/Makefile +++ b/package/tinyxml/Makefile @@ -28,6 +28,6 @@ tinyxml-install: $(CP) $(WRKBUILD)/libtinyxml*.so* \ $(IDIR_TINYXML)/usr/lib $(INSTALL_DATA) $(WRKBUILD)/tiny{str,xml}.h \ - $(STAGING_DIR)/usr/include + $(STAGING_TARGET_DIR)/usr/include include ${TOPDIR}/mk/pkg-bottom.mk |