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/font-util/Makefile | |
| parent | ed3d91cf2dfc6f63ae749b54c7d718eb73dd6211 (diff) | |
| parent | 6e58f05aaae4943de494bc30dd3bf184a6d676f2 (diff) | |
resolve conflict
Diffstat (limited to 'package/font-util/Makefile')
| -rw-r--r-- | package/font-util/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/package/font-util/Makefile b/package/font-util/Makefile index fb1d6070c..e61808321 100644 --- a/package/font-util/Makefile +++ b/package/font-util/Makefile @@ -22,9 +22,9 @@ $(eval $(call PKG_template,FONT_UTIL,font-util,${PKG_VERSION}-${PKG_RELEASE},${P # calling pkg-config (which we don't provide) in order to # automatically find the mappings. post-build: - ${INSTALL_DIR} ${STAGING_DIR}/usr/share/fonts/X11/util + ${INSTALL_DIR} ${STAGING_TARGET_DIR}/usr/share/fonts/X11/util ${CP} ${WRKBUILD}/map-* \ - ${STAGING_DIR}/usr/share/fonts/X11/util + ${STAGING_TARGET_DIR}/usr/share/fonts/X11/util font-util-install: ${INSTALL_DIR} ${IDIR_FONT_UTIL}/usr/bin |