From 9b29616d08763a85237888f2eaa6196196574376 Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Fri, 15 Mar 2013 14:41:56 +0800 Subject: phpmyadmin: fix PN->BPN in do_install for multilibs Signed-off-by: Jackie Huang Signed-off-by: Joe MacDonald --- meta-webserver/recipes-php/phpmyadmin/phpmyadmin_3.5.2.2.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'meta-webserver') 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 e3a581c679..1118e23713 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" -- cgit 1.2.3-korg