[FFmpeg-devel] [PATCH] build: allow for PKG_CONFIG_LIBDIR

[Michael Niedermayer]

On Thu, May 28, 2015 at 03:14:42PM +0200, Ingo Brückl wrote:
> The pkgconfig files should be installed in PKG_CONFIG_LIBDIR
> if defined, rather than in LIBDIR.

isnt it possible for PKG_CONFIG_LIBDIR to contain multiple ":"
seperated directories ?

if so i suspect the code below would break but i didnt test


>
> Signed-off-by: Ingo Brückl <ib at wupperonline.de>
>
> diff --git a/library.mak b/library.mak
> index e23abd2..d5c11d6 100644
> --- a/library.mak
> +++ b/library.mak
> @@ -90,8 +90,8 @@ install-lib$(NAME)-headers: $(addprefix $(SUBDIR),$(HEADERS) $(BUILT_HEADERS))
>  	$$(INSTALL) -m 644 $$^ "$(INCINSTDIR)"
>
>  install-lib$(NAME)-pkgconfig: $(SUBDIR)lib$(FULLNAME).pc
> -	$(Q)mkdir -p "$(LIBDIR)/pkgconfig"
> -	$$(INSTALL) -m 644 $$^ "$(LIBDIR)/pkgconfig"
> +	$(Q)mkdir -p "$(or $(PKG_CONFIG_LIBDIR),$(LIBDIR)/pkgconfig)"
> +	$$(INSTALL) -m 644 $$^ "$(or $(PKG_CONFIG_LIBDIR),$(LIBDIR)/pkgconfig)"
>
>  uninstall-libs::
>  	-$(RM) "$(SHLIBDIR)/$(SLIBNAME_WITH_MAJOR)" \
> --
> 1.7.10
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel at ffmpeg.org
> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
> 

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

You can kill me, but you cannot change the truth.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20150529/b6a25f96/attachment.asc>