har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: add configure option pkgconfigdir

Browse Source 
This allows the user to override the directory for the installation
of the pkg-config files (from the default LIBDIR/pkgconfig).

It follows the usual behaviour of Makefiles generated by automake.

Signed-off-by: Ingo Brückl <ib@wupperonline.de>
Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Ingo Brückl 2015-05-29 16:08:36 +02:00 committed by Michael Niedermayer
parent e374405d8e
commit 083b1a32d5
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure vendored
View File

@ -87,6 +87,7 @@ Standard options:
--shlibdir=DIR install shared libs in DIR [LIBDIR] --shlibdir=DIR install shared libs in DIR [LIBDIR]
--incdir=DIR install includes in DIR [PREFIX/include] --incdir=DIR install includes in DIR [PREFIX/include]
--mandir=DIR install man page in DIR [PREFIX/share/man] --mandir=DIR install man page in DIR [PREFIX/share/man]
--pkgconfigdir=DIR install pkg-config files in DIR [LIBDIR/pkgconfig]
--enable-rpath use rpath to allow installing libraries in paths --enable-rpath use rpath to allow installing libraries in paths
not part of the dynamic linker search path not part of the dynamic linker search path
use rpath when linking programs [USE WITH CARE] use rpath when linking programs [USE WITH CARE]
@ -1954,6 +1955,7 @@ PATHS_LIST="
incdir incdir
libdir libdir
mandir mandir
pkgconfigdir
prefix prefix
shlibdir shlibdir
" "
@ -4487,6 +4489,7 @@ check_cpp_condition stdlib.h "defined(__PIC__) || defined(__pic__) || defined(PI
set_default libdir set_default libdir
: ${shlibdir_default:="$libdir"} : ${shlibdir_default:="$libdir"}
: ${pkgconfigdir_default:="$libdir/pkgconfig"}
set_default $PATHS_LIST set_default $PATHS_LIST
set_default nm set_default nm
@ -5799,6 +5802,7 @@ BINDIR=\$(DESTDIR)$bindir
DATADIR=\$(DESTDIR)$datadir DATADIR=\$(DESTDIR)$datadir
DOCDIR=\$(DESTDIR)$docdir DOCDIR=\$(DESTDIR)$docdir
MANDIR=\$(DESTDIR)$mandir MANDIR=\$(DESTDIR)$mandir
PKGCONFIGDIR=\$(DESTDIR)$pkgconfigdir
SRC_PATH=$source_path SRC_PATH=$source_path
ifndef MAIN_MAKEFILE ifndef MAIN_MAKEFILE
SRC_PATH:=\$(SRC_PATH:.%=..%) SRC_PATH:=\$(SRC_PATH:.%=..%)

6
library.mak
View File

@ -90,8 +90,8 @@ install-lib$(NAME)-headers: $(addprefix $(SUBDIR),$(HEADERS) $(BUILT_HEADERS))
$$(INSTALL) -m 644 $$^ "$(INCINSTDIR)" $$(INSTALL) -m 644 $$^ "$(INCINSTDIR)"
install-lib$(NAME)-pkgconfig: $(SUBDIR)lib$(FULLNAME).pc install-lib$(NAME)-pkgconfig: $(SUBDIR)lib$(FULLNAME).pc
$(Q)mkdir -p "$(LIBDIR)/pkgconfig" $(Q)mkdir -p "$(PKGCONFIGDIR)"
$$(INSTALL) -m 644 $$^ "$(LIBDIR)/pkgconfig" $$(INSTALL) -m 644 $$^ "$(PKGCONFIGDIR)"
uninstall-libs:: uninstall-libs::
-$(RM) "$(SHLIBDIR)/$(SLIBNAME_WITH_MAJOR)" \ -$(RM) "$(SHLIBDIR)/$(SLIBNAME_WITH_MAJOR)" \
@ -103,7 +103,7 @@ uninstall-libs::
uninstall-headers:: uninstall-headers::
$(RM) $(addprefix "$(INCINSTDIR)/",$(HEADERS) $(BUILT_HEADERS)) $(RM) $(addprefix "$(INCINSTDIR)/",$(HEADERS) $(BUILT_HEADERS))
$(RM) "$(LIBDIR)/pkgconfig/lib$(FULLNAME).pc" $(RM) "$(PKGCONFIGDIR)/lib$(FULLNAME).pc"
-rmdir "$(INCINSTDIR)" -rmdir "$(INCINSTDIR)"
endef endef