]> granicus.if.org Git - handbrake/commitdiff
Build: fix duplicate pkgconfig include
authorKonaBlend <kona8lend@gmail.com>
Fri, 30 Oct 2015 00:24:56 +0000 (20:24 -0400)
committerBradley Sepos <bradley@bradleysepos.com>
Wed, 25 May 2016 19:45:04 +0000 (15:45 -0400)
pkgconfig module is specified twice by the build system, causing much
grief. Caused when both local-autotools and local-pkgconfig are enabled.

make/include/main.defs

index 1aa36c48554103ef7b5497b0dac1444599a4c2b0..2c9a6f108f4e00db862408f863bb1fe23894d983 100644 (file)
@@ -22,7 +22,9 @@ ifeq (1,$(FEATURE.local_autotools))
     MODULES += contrib/automake
     MODULES += contrib/libtool
     MODULES += contrib/m4
+ifneq (1,$(FEATURE.local_pkgconfig))
     MODULES += contrib/pkgconfig
+endif
     AUTOTOOL_MODULES = AUTOCONF AUTOMAKE LIBTOOL M4 PKGCONFIG
     HB_TOOLS_PATH = $(call fn.ABSOLUTE,$(CONTRIB.build/)bin)
 else