diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-08-06 17:05:09 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-08-06 17:05:09 +0200 |
| commit | 208807cc63754f699107bbad24687b3ae1d326fe (patch) | |
| tree | 749ada25a27d3659f1b24ae245fe6a416eeb7dae /package/pcrepp/Makefile | |
| parent | f0b814dddb1b74c91fd54af412ad356fc68be4a2 (diff) | |
| parent | b03ac31608c2ee5349a5d098980105957a4a6bca (diff) | |
fix conflict
Diffstat (limited to 'package/pcrepp/Makefile')
| -rw-r--r-- | package/pcrepp/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/package/pcrepp/Makefile b/package/pcrepp/Makefile index 639f5ad53..ae848d3d6 100644 --- a/package/pcrepp/Makefile +++ b/package/pcrepp/Makefile @@ -19,15 +19,15 @@ PKG_CXX:= pcrepp PKG_CFLINE_PCREPP:= depends on ADK_TARGET_LIB_EGLIBC || ADK_TARGET_LIB_GLIBC DISTFILES:= pcre++-${PKG_VERSION}.tar.gz +WRKDIST= ${WRKDIR}/pcre++-${PKG_VERSION} include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,PCREPP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -post-extract: - mv ${WRKDIR_BASE}/w-${PKG_NAME}-${PKG_VERSION}-${PKG_RELEASE}/pcre++-${PKG_VERSION} ${WRKBUILD} - post-install: - ${CP} ${WRKINST}/* ${WRKINST}/../pkg-${PKG_NAME} + $(INSTALL_DIR) $(IDIR_PCREPP)/usr/lib + $(CP) $(WRKINST)/usr/lib/libpcre++.so* \ + $(IDIR_PCREPP)/usr/lib include ${TOPDIR}/mk/pkg-bottom.mk |