From: Rosen Penev <redacted>
Date: Tue, 14 Jul 2020 05:01:34 +0000 (-0700)
Subject: h2o: fix pkgconfig paths
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=356fa3486f77710c5cc8e3c59ae1a28b1520fd61;p=openwrt-packages.git

h2o: fix pkgconfig paths

Signed-off-by: Rosen Penev <redacted>
---

diff --git a/libs/h2o/Makefile b/libs/h2o/Makefile
index dbf4e3253..d9723b969 100644
--- a/libs/h2o/Makefile
+++ b/libs/h2o/Makefile
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=h2o
 PKG_VERSION:=2.2.6
-PKG_RELEASE:=6
+PKG_RELEASE:=7
 
 PKG_SOURCE_URL:=https://codeload.github.com/h2o/h2o/tar.gz/v${PKG_VERSION}?
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
@@ -22,8 +22,6 @@ CMAKE_OPTIONS:= \
 	-DBUILD_SHARED_LIBS=ON \
 	-DWITH_MRUBY=OFF
 
-CMAKE_INSTALL:=1
-
 define Package/libh2o-evloop
   SECTION:=libs
   CATEGORY:=Libraries
@@ -40,6 +38,14 @@ define Package/libh2o
   DEPENDS:=+libuv +libopenssl +zlib +libyaml +ruby
 endef
 
+define Build/InstallDev
+	$(call Build/InstallDev/cmake,$(1))
+	$(SED) 's,/usr/include,$$$${prefix}/include,g' $(1)/usr/lib/pkgconfig/libh2o-evloop.pc
+	$(SED) 's,/usr/lib,$$$${exec_prefix}/lib,g' $(1)/usr/lib/pkgconfig/libh2o-evloop.pc
+	$(SED) 's,/usr/include,$$$${prefix}/include,g' $(1)/usr/lib/pkgconfig/libh2o.pc
+	$(SED) 's,/usr/lib,$$$${exec_prefix}/lib,g' $(1)/usr/lib/pkgconfig/libh2o.pc
+endef
+
 define Package/libh2o-evloop/install
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libh2o-evloop.so* $(1)/usr/lib/