[oe-commits] Jackie Huang : phpmyadmin: fix PN->BPN in do_install for multilibs

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master
Commit: 9b29616d08763a85237888f2eaa6196196574376
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=9b29616d08763a85237888f2eaa6196196574376

Author: Jackie Huang <jackie.huang at windriver.com>
Date:   Fri Mar 15 14:41:56 2013 +0800

phpmyadmin: fix PN->BPN in do_install for multilibs

Signed-off-by: Jackie Huang <jackie.huang at windriver.com>
Signed-off-by: Joe MacDonald <joe.macdonald at windriver.com>

---

 .../recipes-php/phpmyadmin/phpmyadmin_3.5.2.2.bb   |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_3.5.2.2.bb b/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_3.5.2.2.bb
index e3a581c..1118e23 100644
--- a/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_3.5.2.2.bb
+++ b/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_3.5.2.2.bb
@@ -5,7 +5,7 @@ LICENSE = "GPLv2 & LGPLv3 & MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=eb723b61539feef013de476e68b5c50a \
                     file://libraries/tcpdf/LICENSE.TXT;md5=5c87b66a5358ebcc495b03e0afcd342c"
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/phpmyadmin/phpMyAdmin/${PV}/phpMyAdmin-${PV}-all-languages.tar.xz \
            file://apache.conf"
@@ -18,13 +18,13 @@ S = "${WORKDIR}/phpMyAdmin-${PV}-all-languages"
 inherit allarch
 
 do_install() {
-	install -d ${D}${datadir}/${PN}
-	cp -a * ${D}${datadir}/${PN}
+	install -d ${D}${datadir}/${BPN}
+	cp -a * ${D}${datadir}/${BPN}
 
 	install -d ${D}${sysconfdir}/apache2/conf.d
 	install -m 0644 ${WORKDIR}/apache.conf ${D}${sysconfdir}/apache2/conf.d/phpmyadmin.conf
 }
 
-FILES_${PN} = "${datadir}/${PN} \
+FILES_${PN} = "${datadir}/${BPN} \
                ${sysconfdir}/apache2/conf.d"