diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-04-13 04:53:48 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-04-13 04:53:48 +0200 |
| commit | 18cb3f5227c4012c65b65b25b64b6abf867c8989 (patch) | |
| tree | cf6512cb7f962da82ae8b3fde538f1cd6e4474af /package/mpfr | |
| parent | 92623154c7b3edde7bf4812530e4db9de2779283 (diff) | |
resolve merge conflict
Diffstat (limited to 'package/mpfr')
| -rw-r--r-- | package/mpfr/Makefile | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/package/mpfr/Makefile b/package/mpfr/Makefile index f4bc9982e..619988cc6 100644 --- a/package/mpfr/Makefile +++ b/package/mpfr/Makefile @@ -16,13 +16,9 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,MPFR,mpfr,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,MPFR_DEV,mpfr-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_MPFR_DEV},${PKGSC_MPFR_DEV})) -<<<<<<< HEAD -mpfr-install: -======= TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) -post-install: ->>>>>>> ed73ed80fe75787a18a3ecf2335ff62d799eba01 +mpfr-install: ${INSTALL_DIR} ${IDIR_MPFR}/usr/lib ${CP} ${WRKINST}/usr/lib/libmpfr.so* ${IDIR_MPFR}/usr/lib |