[SCM] kodi/master: Fix set core configure options to all instances.

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit d77db8bb54abe83a63fd2c0b4adcbfd36befd232
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Tue Oct 3 21:44:28 2017 +0200

    Fix set core configure options to all instances.

diff --git a/debian/rules b/debian/rules
index 425066f..1e151ae 100755
--- a/debian/rules
+++ b/debian/rules
@@ -45,10 +45,14 @@ export DEB_LDFLAGS_MAINT_APPEND = -latomic
 # for embedded libdvd*:
 export DEB_CPPFLAGS_MAINT_APPEND = -D_XBMC
 
-# List of options to pass to configure. Can be overridden.
+# List of options to pass to _any_ configure.
+CORE_CONFIG_OPTIONS ?= --host=$(DEB_HOST_GNU_TYPE) \
+  --disable-dependency-tracking \
+
+# List of options to pass to configure of Kodi. Can be overridden.
 # Extra options can simply be passed using KODI_CONFIG_EXTRA_OPTIONS env
 # variable.
-KODI_CONFIG_OPTIONS ?= --host=$(DEB_HOST_GNU_TYPE) \
+KODI_CONFIG_OPTIONS ?= $(CORE_CONFIG_OPTIONS) \
   $(GL_CONFIG_OPTIONS) \
   --disable-openmax \
   --disable-tegra \
@@ -64,7 +68,6 @@ KODI_CONFIG_OPTIONS ?= --host=$(DEB_HOST_GNU_TYPE) \
   --enable-libcec \
   --disable-airtunes \
   --with-ffmpeg=shared \
-  --disable-dependency-tracking \
   --disable-non-free \
   --enable-gtest \
   --with-lirc-device=/var/run/lirc/lircd \
@@ -113,11 +116,11 @@ override_dh_auto_configure: configure
 	# Add "from Debian" next to Kodi's original logo
 	inkscape -z -w 250 -h 82 --export-png=addons/skin.estuary/media/from-debian-logo.png debian/from-debian-logo.svg
 	(cd $(DVDREAD_COMPONENT) && autoreconf -vif && \
-		$(shell dpkg-buildflags --export=configure) ./configure \
+		$(shell dpkg-buildflags --export=configure) ./configure $(CORE_CONFIG_OPTIONS) \
 		--prefix=$(CURDIR)/tools/depends/target/libdvdread/dvdread-install --disable-shared --enable-static --with-pic && \
 		$(MAKE) install) && \
 	(cd $(DVDNAV_COMPONENT) && autoreconf -vif && \
-		$(shell dpkg-buildflags --export=configure) PKG_CONFIG_PATH="$(CURDIR)/tools/depends/target/libdvdread/dvdread-install/lib/pkgconfig" ./configure \
+		$(shell dpkg-buildflags --export=configure) PKG_CONFIG_PATH="$(CURDIR)/tools/depends/target/libdvdread/dvdread-install/lib/pkgconfig" ./configure $(CORE_CONFIG_OPTIONS) \
 		--prefix=$(CURDIR)/tools/depends/target/libdvdnav/dvdnav-install --disable-shared --enable-static --with-pic && \
 		$(MAKE) install)
 
@@ -144,7 +147,10 @@ override_dh_install-indep:
 	dh_install -i -XLICENCE -XLICENSE \
 		-XLicence.txt -XLicense.txt -XLICENSE.txt \
 		-XNOTICE.txt \
-		-Xjquery-1.8.2.min.js -Xiscroll-min.js
+		-Xjquery-1.8.2.min.js -Xiscroll-min.js \
+		-Nkodi-repository-kodi -Xusr/share/kodi/addons/repository.xbmc.org
+	dh_install -pkodi-repository-kodi \
+		addons/repository.xbmc.org/* usr/share/kodi/addons/repository.xbmc.org
 
 override_dh_install-arch:
 	dh_install -a -XLICENCE -XLICENSE -XLicence.txt -XLicense.txt \

-- 
kodi packaging