diff mbox

[OpenWrt-Devel] package: libs: libnl: fix include installation directory

Message ID 1443692461-11118-1-git-send-email-fercerpav@gmail.com
State Superseded
Headers show

Commit Message

Paul Fertser Oct. 1, 2015, 9:41 a.m. UTC
Without this patch packages that use pkg-config to find libnl3 includes fail to
build because the path in the .pc file doesn't match actual install location.
Make it the way upstream proposes and let whomever depend on libnl use
pkg-config to find it.

Signed-off-by: Paul Fertser <fercerpav@gmail.com>
---
 package/libs/libnl/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Rick Farina Oct. 1, 2015, 4:28 p.m. UTC | #1
based on sanity I'm going to move aircrack-ng upstream to use pkg-config
so this patch is a prerequisite to making that work on openwrt

ACK from me.

Thanks,
Zero_Chaos

On 10/01/2015 05:41 AM, Paul Fertser wrote:
> Without this patch packages that use pkg-config to find libnl3 includes fail to
> build because the path in the .pc file doesn't match actual install location.
> Make it the way upstream proposes and let whomever depend on libnl use
> pkg-config to find it.
> 
> Signed-off-by: Paul Fertser <fercerpav@gmail.com>
> ---
>  package/libs/libnl/Makefile | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/package/libs/libnl/Makefile b/package/libs/libnl/Makefile
> index 857bbe2..adf743a 100644
> --- a/package/libs/libnl/Makefile
> +++ b/package/libs/libnl/Makefile
> @@ -86,7 +86,7 @@ endef
>  
>  define Build/InstallDev
>  	$(INSTALL_DIR) $(1)/usr/include/libnl $(1)/usr/lib/pkgconfig
> -	$(CP) $(PKG_INSTALL_DIR)/usr/include/libnl3/* $(1)/usr/include/libnl/
> +	$(CP) $(PKG_INSTALL_DIR)/usr/include/libnl3 $(1)/usr/include/
>  	$(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib
>  	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/*.pc $(1)/usr/lib/pkgconfig
>  
>
diff mbox

Patch

diff --git a/package/libs/libnl/Makefile b/package/libs/libnl/Makefile
index 857bbe2..adf743a 100644
--- a/package/libs/libnl/Makefile
+++ b/package/libs/libnl/Makefile
@@ -86,7 +86,7 @@  endef
 
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include/libnl $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/libnl3/* $(1)/usr/include/libnl/
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/libnl3 $(1)/usr/include/
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/*.pc $(1)/usr/lib/pkgconfig