diff options
author | Jackie Huang <jackie.huang@windriver.com> | 2013-03-15 14:41:56 +0800 |
---|---|---|
committer | Joe MacDonald <joe.macdonald@windriver.com> | 2013-03-18 15:13:52 -0400 |
commit | 9b29616d08763a85237888f2eaa6196196574376 (patch) | |
tree | e59397da9e78d7b4c695458be46c10b05d889812 | |
parent | 70b1e90f6dc11f0969809f36ad22c6f1bfd4f74d (diff) | |
download | meta-openembedded-9b29616d08763a85237888f2eaa6196196574376.tar.gz |
phpmyadmin: fix PN->BPN in do_install for multilibs
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Joe MacDonald <joe.macdonald@windriver.com>
-rw-r--r-- | meta-webserver/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 e3a581c67..1118e2371 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" | |||
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=eb723b61539feef013de476e68b5c50a \ | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=eb723b61539feef013de476e68b5c50a \ |
6 | file://libraries/tcpdf/LICENSE.TXT;md5=5c87b66a5358ebcc495b03e0afcd342c" | 6 | file://libraries/tcpdf/LICENSE.TXT;md5=5c87b66a5358ebcc495b03e0afcd342c" |
7 | 7 | ||
8 | PR = "r0" | 8 | PR = "r1" |
9 | 9 | ||
10 | SRC_URI = "${SOURCEFORGE_MIRROR}/phpmyadmin/phpMyAdmin/${PV}/phpMyAdmin-${PV}-all-languages.tar.xz \ | 10 | SRC_URI = "${SOURCEFORGE_MIRROR}/phpmyadmin/phpMyAdmin/${PV}/phpMyAdmin-${PV}-all-languages.tar.xz \ |
11 | file://apache.conf" | 11 | file://apache.conf" |
@@ -18,13 +18,13 @@ S = "${WORKDIR}/phpMyAdmin-${PV}-all-languages" | |||
18 | inherit allarch | 18 | inherit allarch |
19 | 19 | ||
20 | do_install() { | 20 | do_install() { |
21 | install -d ${D}${datadir}/${PN} | 21 | install -d ${D}${datadir}/${BPN} |
22 | cp -a * ${D}${datadir}/${PN} | 22 | cp -a * ${D}${datadir}/${BPN} |
23 | 23 | ||
24 | install -d ${D}${sysconfdir}/apache2/conf.d | 24 | install -d ${D}${sysconfdir}/apache2/conf.d |
25 | install -m 0644 ${WORKDIR}/apache.conf ${D}${sysconfdir}/apache2/conf.d/phpmyadmin.conf | 25 | install -m 0644 ${WORKDIR}/apache.conf ${D}${sysconfdir}/apache2/conf.d/phpmyadmin.conf |
26 | } | 26 | } |
27 | 27 | ||
28 | FILES_${PN} = "${datadir}/${PN} \ | 28 | FILES_${PN} = "${datadir}/${BPN} \ |
29 | ${sysconfdir}/apache2/conf.d" | 29 | ${sysconfdir}/apache2/conf.d" |
30 | 30 | ||