This allows the user to override the directory for the installation
of the pkg-config files (from the default /usr/lib/pkgconfig).
It follows the usual behaviour of Makefiles generated by automake.
Signed-off-by: Ingo Brückl <i...@wupperonline.de>
diff --git a/configure b/configure
old mode 100755
new mode 100644
index a90fef1..f2d2386
--- a/configure
+++ b/configure
@@ -87,6 +87,7 @@ Standard options:
--shlibdir=DIR install shared libs in DIR [LIBDIR]
--incdir=DIR install includes in DIR [PREFIX/include]
--mandir=DIR install man page in DIR [PREFIX/share/man]
+ --pkgconfigdir=DIR install pkg-config files in DIR
[PREFIX/lib/pkgconfig]
--enable-rpath use rpath to allow installing libraries in paths
not part of the dynamic linker search path
use rpath when linking programs [USE WITH CARE]
@@ -1954,6 +1955,7 @@ PATHS_LIST="
incdir
libdir
mandir
+ pkgconfigdir
prefix
shlibdir
"
@@ -2774,6 +2776,7 @@ docdir_default='${prefix}/share/doc/ffmpeg'
incdir_default='${prefix}/include'
libdir_default='${prefix}/lib'
mandir_default='${prefix}/share/man'
+pkgconfigdir_default='${prefix}/lib/pkgconfig'
# toolchain
ar_default="ar"
@@ -5799,6 +5802,7 @@ BINDIR=\$(DESTDIR)$bindir
DATADIR=\$(DESTDIR)$datadir
DOCDIR=\$(DESTDIR)$docdir
MANDIR=\$(DESTDIR)$mandir
+PKGCONFIGDIR=\$(DESTDIR)$pkgconfigdir
SRC_PATH=$source_path
ifndef MAIN_MAKEFILE
SRC_PATH:=\$(SRC_PATH:.%=..%)
diff --git a/library.mak b/library.mak
index e23abd2..7c26024 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 "$(PKGCONFIGDIR)"
+ $$(INSTALL) -m 644 $$^ "$(PKGCONFIGDIR)"
uninstall-libs::
-$(RM) "$(SHLIBDIR)/$(SLIBNAME_WITH_MAJOR)" \
@@ -103,7 +103,7 @@ uninstall-libs::
uninstall-headers::
$(RM) $(addprefix "$(INCINSTDIR)/",$(HEADERS) $(BUILT_HEADERS))
- $(RM) "$(LIBDIR)/pkgconfig/lib$(FULLNAME).pc"
+ $(RM) "$(PKGCONFIGDIR)/lib$(FULLNAME).pc"
-rmdir "$(INCINSTDIR)"
endef
--
1.7.10
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
