From 82f55fd958a37997487aabff92f2004d6afe9c48 Mon Sep 17 00:00:00 2001
From: persianpros <persianpros@yahoo.com>
Date: Tue, 27 Aug 2019 00:17:51 +0430
Subject: [PATCH] Don't hardcode path

---
 enigma2-plugin-extensions-autobackup.bb           | 2 +-
 enigma2-plugin-extensions-autobouquets.bb         | 2 +-
 enigma2-plugin-extensions-foreca.bb               | 4 ++--
 enigma2-plugin-extensions-hetweer.bb              | 4 ++--
 enigma2-plugin-extensions-newsreader.bb           | 4 ++--
 enigma2-plugin-extensions-openairplay.bb          | 2 +-
 enigma2-plugin-extensions-openwebif.bb            | 2 +-
 enigma2-plugin-extensions-ppanel.bb               | 2 +-
 enigma2-plugin-systemplugins-autobouquetsmaker.bb | 4 ++--
 9 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/enigma2-plugin-extensions-autobackup.bb b/enigma2-plugin-extensions-autobackup.bb
index 42cc8a6..750015c 100644
--- a/enigma2-plugin-extensions-autobackup.bb
+++ b/enigma2-plugin-extensions-autobackup.bb
@@ -9,7 +9,7 @@ require openplugins-distutils.inc
 # and decided that this would be good enough until someone explains how to do this properly
 # with distutils.
 do_install_append() {
-	chmod a+x ${D}/usr/lib/enigma2/python/Plugins/*/*/*.sh
+	chmod a+x ${D}${libdir}/enigma2/python/Plugins/*/*/*.sh
 }
 
 require assume-gplv2.inc
diff --git a/enigma2-plugin-extensions-autobouquets.bb b/enigma2-plugin-extensions-autobouquets.bb
index 3fc5827..1118853 100644
--- a/enigma2-plugin-extensions-autobouquets.bb
+++ b/enigma2-plugin-extensions-autobouquets.bb
@@ -25,7 +25,7 @@ SRC_URI="git://github.com/LraiZer/AutoBouquets.git;branch=${AUTOBOUQUETS_BRANCH}
 
 S = "${WORKDIR}/git"
 
-FILES_${PN} = "/usr/lib/enigma2/python/Plugins/Extensions/AutoBouquets"
+FILES_${PN} = "${libdir}/enigma2/python/Plugins/Extensions/AutoBouquets"
 D_FILES_PN = "${D}${FILES_${PN}}"
 
 EXTRA_OECONF = ""
diff --git a/enigma2-plugin-extensions-foreca.bb b/enigma2-plugin-extensions-foreca.bb
index 1e4d198..7870ff2 100644
--- a/enigma2-plugin-extensions-foreca.bb
+++ b/enigma2-plugin-extensions-foreca.bb
@@ -9,7 +9,7 @@ PR = "r0"
 
 require openplugins-distutils.inc
 
-FILES_${PN} += "/etc/enigma2/Foreca"
-CONFFILES_${PN} = "/etc/enigma2/Foreca/City.cfg /etc/enigma2/Foreca/Filter.cfg"
+FILES_${PN} += "${sysconfdir}/enigma2/Foreca"
+CONFFILES_${PN} = "${sysconfdir}/enigma2/Foreca/City.cfg ${sysconfdir}/enigma2/Foreca/Filter.cfg"
 
 require assume-gplv2.inc
diff --git a/enigma2-plugin-extensions-hetweer.bb b/enigma2-plugin-extensions-hetweer.bb
index 9185ad5..2c9f707 100644
--- a/enigma2-plugin-extensions-hetweer.bb
+++ b/enigma2-plugin-extensions-hetweer.bb
@@ -7,7 +7,7 @@ require openplugins-distutils.inc
 
 require assume-gplv2.inc
 
-PLUGINPATH = "/usr/lib/enigma2/python/Plugins/Extensions/${MODULE}"
+PLUGINPATH = "${libdir}/enigma2/python/Plugins/Extensions/${MODULE}"
 do_install() {
         install -d ${D}${PLUGINPATH}/Images
         cp -r ${S}/plugin/* ${D}${PLUGINPATH}
@@ -16,7 +16,7 @@ do_install() {
 
 
 pkg_postrm_${PN}() {
-    rm -rf /usr/lib/enigma2/python/Plugins/Extensions/HetWeer
+    rm -rf ${libdir}/enigma2/python/Plugins/Extensions/HetWeer
 }
 
 FILES_${PN} = "${PLUGINPATH}"
diff --git a/enigma2-plugin-extensions-newsreader.bb b/enigma2-plugin-extensions-newsreader.bb
index 82a985c..8ef6fa8 100644
--- a/enigma2-plugin-extensions-newsreader.bb
+++ b/enigma2-plugin-extensions-newsreader.bb
@@ -5,7 +5,7 @@ require openplugins-replace-pli.inc
 
 require openplugins-distutils.inc
 
-FILES_${PN} += "/etc/feeds.xml"
-CONFFILES_${PN} = "/etc/feeds.xml"
+FILES_${PN} += "${sysconfdir}/feeds.xml"
+CONFFILES_${PN} = "${sysconfdir}/feeds.xml"
 
 require assume-gplv2.inc
diff --git a/enigma2-plugin-extensions-openairplay.bb b/enigma2-plugin-extensions-openairplay.bb
index ed0567c..c2d1c7b 100644
--- a/enigma2-plugin-extensions-openairplay.bb
+++ b/enigma2-plugin-extensions-openairplay.bb
@@ -12,7 +12,7 @@ PR = "r0.2"
 
 require openplugins.inc
 
-PLUGINPATH = "/usr/lib/enigma2/python/Plugins/Extensions/${MODULE}"
+PLUGINPATH = "${libdir}/enigma2/python/Plugins/Extensions/${MODULE}"
 do_install() {
 	install -d ${D}${PLUGINPATH}
 	cp -r --preserve=mode,links ${S}/plugin/* ${D}${PLUGINPATH}
diff --git a/enigma2-plugin-extensions-openwebif.bb b/enigma2-plugin-extensions-openwebif.bb
index 892e438..59859c9 100644
--- a/enigma2-plugin-extensions-openwebif.bb
+++ b/enigma2-plugin-extensions-openwebif.bb
@@ -29,7 +29,7 @@ do_compile() {
 	python -O -m compileall -d ${PLUGINPATH} ${S}/plugin
 }
 
-PLUGINPATH = "/usr/lib/enigma2/python/Plugins/Extensions/${MODULE}"
+PLUGINPATH = "${libdir}/enigma2/python/Plugins/Extensions/${MODULE}"
 do_install_append() {
 	install -d ${D}${PLUGINPATH}
 	cp -r ${S}/plugin/* ${D}${PLUGINPATH}
diff --git a/enigma2-plugin-extensions-ppanel.bb b/enigma2-plugin-extensions-ppanel.bb
index 8014cf9..6c42841 100644
--- a/enigma2-plugin-extensions-ppanel.bb
+++ b/enigma2-plugin-extensions-ppanel.bb
@@ -6,4 +6,4 @@ require openplugins-distutils.inc
 require assume-gplv2.inc
 
 PACKAGES =+ "${PN}-example"
-FILES_${PN}-example = "/etc/ppanel/PPanel_tutorial.xml"
+FILES_${PN}-example = "${sysconfdir}/ppanel/PPanel_tutorial.xml"
diff --git a/enigma2-plugin-systemplugins-autobouquetsmaker.bb b/enigma2-plugin-systemplugins-autobouquetsmaker.bb
index ba4c5df..54d3bed 100644
--- a/enigma2-plugin-systemplugins-autobouquetsmaker.bb
+++ b/enigma2-plugin-systemplugins-autobouquetsmaker.bb
@@ -37,8 +37,8 @@ pkg_preinst_${PN}_prepend() {
 #!/bin/sh
 echo "Checking for an ABM cache file"
 
-if [ -f /usr/lib/enigma2/python/Plugins/SystemPlugins/AutoBouquetsMaker/providers/providers.cache ]; then
-	rm -f /usr/lib/enigma2/python/Plugins/SystemPlugins/AutoBouquetsMaker/providers/providers.cache > /dev/null 2>&1
+if [ -f ${libdir}/enigma2/python/Plugins/SystemPlugins/AutoBouquetsMaker/providers/providers.cache ]; then
+	rm -f ${libdir}/enigma2/python/Plugins/SystemPlugins/AutoBouquetsMaker/providers/providers.cache > /dev/null 2>&1
 	echo "Cache file has been removed"
 else
 	echo "No cache file found"