php7-pecl-{propro,raphf}: fix two problems (refs #3149)

- refine build dir to avoid collisions with php5 package variants
- properly install headers to location where depended packages look for it

Signed-off-by: Michael Heimpold <mhei@heimpold.de>

diff --git a/lang/php7-pecl-propro/Makefile b/lang/php7-pecl-propro/Makefile
index eba6dae7b87ec8b2457b522c8b333707f27f9cf4..3bfe5356c1fa5b907a90f289ea71d6bf680969a8 100644 (file)
--- a/lang/php7-pecl-propro/Makefile
+++ b/lang/php7-pecl-propro/Makefile
@@ -21,7 +21,7 @@ PKG_MAINTAINER:=Michael Heimpold <mhei@heimpold.de>
 PKG_LICENSE:=BSD-2-Clause
 PKG_LICENSE_FILES:=LICENSE
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PECL_NAME)-$(PKG_VERSION)
+PKG_BUILD_DIR:=$(BUILD_DIR)/pecl-php7/$(PECL_NAME)-$(PKG_VERSION)
 PKG_BUILD_PARALLEL:=1
 
 PKG_FIXUP:=autoreconf
@@ -33,5 +33,11 @@ include ../php7/pecl.mk
 CONFIGURE_ARGS+= \
        --enable-propro
 
+define Build/InstallDev
+       mkdir -p $(STAGING_DIR)/usr/include/php7/ext/$(PECL_NAME)
+       $(CP) $(PKG_BUILD_DIR)/php_propro.h $(STAGING_DIR)/usr/include/php7/ext/$(PECL_NAME)/
+       $(CP) $(PKG_BUILD_DIR)/php_propro_api.h $(STAGING_DIR)/usr/include/php7/ext/$(PECL_NAME)/
+endef
+
 $(eval $(call PECLPackage,$(PECL_NAME),$(PECL_LONGNAME)))
 $(eval $(call BuildPackage,$(PKG_NAME)))

diff --git a/lang/php7-pecl-raphf/Makefile b/lang/php7-pecl-raphf/Makefile
index 488270415657d545d7219a8450acbd20bdc93143..4ce09f9869e8d009467a2d789c8a6be3cc731495 100644 (file)
--- a/lang/php7-pecl-raphf/Makefile
+++ b/lang/php7-pecl-raphf/Makefile
@@ -21,7 +21,7 @@ PKG_MAINTAINER:=Michael Heimpold <mhei@heimpold.de>
 PKG_LICENSE:=BSD-2-Clause
 PKG_LICENSE_FILES:=LICENSE
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PECL_NAME)-$(PKG_VERSION)
+PKG_BUILD_DIR:=$(BUILD_DIR)/pecl-php7/$(PECL_NAME)-$(PKG_VERSION)
 PKG_BUILD_PARALLEL:=1
 
 PKG_FIXUP:=autoreconf
@@ -33,5 +33,11 @@ include ../php7/pecl.mk
 CONFIGURE_ARGS+= \
        --enable-raphf
 
+define Build/InstallDev
+       mkdir -p $(STAGING_DIR)/usr/include/php7/ext/$(PECL_NAME)
+       cp $(PKG_BUILD_DIR)/php_raphf.h $(STAGING_DIR)/usr/include/php7/ext/$(PECL_NAME)/
+       cp $(PKG_BUILD_DIR)/php_raphf_api.h $(STAGING_DIR)/usr/include/php7/ext/$(PECL_NAME)/
+endef
+
 $(eval $(call PECLPackage,$(PECL_NAME),$(PECL_LONGNAME)))
 $(eval $(call BuildPackage,$(PKG_NAME)))