From f86acf1e1a3dd3a37886107cabf6f51e8a6c30a8 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Thu, 10 Dec 2020 01:41:23 -0800 Subject: [PATCH] libpng: fix paths in config files Signed-off-by: Rosen Penev --- libs/libpng/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/libpng/Makefile b/libs/libpng/Makefile index 7e0bea5d7..426fe57c7 100644 --- a/libs/libpng/Makefile +++ b/libs/libpng/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libpng PKG_VERSION:=1.6.37 -PKG_RELEASE:=7 +PKG_RELEASE:=8 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@SF/libpng @@ -48,9 +48,9 @@ TARGET_LDFLAGS += -lz define Build/InstallDev $(call Build/InstallDev/cmake,$(1)) - $(SED) \ - 's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' \ - $(1)/usr/bin/libpng{,16}-config + $(SED) 's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' $(1)/usr/bin/libpng{,16}-config + $(SED) '/^includedir=/s|/usr|$$$${prefix}|' $(1)/usr/bin/libpng{,16}-config + $(SED) '/^libdir=/s|/usr|$$$${prefix}|' $(1)/usr/bin/libpng{,16}-config $(SED) 's,/usr/include,$$$${prefix}/include,g' $(1)/usr/lib/pkgconfig/libpng16.pc $(SED) 's,/usr/lib,$$$${exec_prefix}/lib,g' $(1)/usr/lib/pkgconfig/libpng16.pc $(INSTALL_DIR) $(2)/bin