From 0402c407c99a0eb312899ed931489c7974fb110f Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Tue, 5 Apr 2011 22:06:59 +0200
Subject: add devel subpackage

---
 package/mpfr/Makefile | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'package/mpfr/Makefile')

diff --git a/package/mpfr/Makefile b/package/mpfr/Makefile
index 77f2c1d6a..a3d91b707 100644
--- a/package/mpfr/Makefile
+++ b/package/mpfr/Makefile
@@ -6,14 +6,22 @@ include ${TOPDIR}/toolchain/mpfr/Makefile.inc
 
 PKG_DESCR:=		multi precision library
 PKG_SECTION:=		libs
-PKG_URL:=		http://www.mpfr.org
+PKG_URL:=		http://www.mpfr.org/
+PKG_SUBPKGS:=		MPFR MPFR_DEV
+PKGSC_MPFR_DEV:=	devel
+PKGSD_MPFR_DEV:=	mpfr headers
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,MPFR,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(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}))
 
-post-install:
+mpfr-install:
 	${INSTALL_DIR} ${IDIR_MPFR}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libmpfr.so* ${IDIR_MPFR}/usr/lib/
+	${CP} ${WRKINST}/usr/lib/libmpfr.so* ${IDIR_MPFR}/usr/lib
+
+mpfr-dev-install:
+	${INSTALL_DIR} ${IDIR_MPFR_DEV}/usr/include
+	$(CP) $(WRKINST)/usr/include/* ${IDIR_MPFR_DEV}/usr/include
 
 include ${TOPDIR}/mk/pkg-bottom.mk
-- 
cgit v1.2.3


From 18cb3f5227c4012c65b65b25b64b6abf867c8989 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 13 Apr 2011 04:53:48 +0200
Subject: resolve merge conflict

---
 package/mpfr/Makefile | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'package/mpfr/Makefile')

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
 
-- 
cgit v1.2.3