summaryrefslogtreecommitdiff
path: root/classes
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@rpsys.net>2008-03-15 16:17:31 +0000
committerRichard Purdie <rpurdie@rpsys.net>2008-03-15 16:17:31 +0000
commitf4b9a60d4df924a24e1e6efe938eb2ddf4692c2f (patch)
treef40c6af7279f4f07c0800b10f3bd16ac5091f2a1 /classes
parent9589247ca3b9608c02196aa6cda38a91a7c1da05 (diff)
Reverse accidental changes in dc0f5b4ef4b836d72bf43dffa503ab86e6f7de54
Diffstat (limited to 'classes')
-rw-r--r--classes/cpan.bbclass13
-rw-r--r--classes/insane.bbclass2
2 files changed, 3 insertions, 12 deletions
diff --git a/classes/cpan.bbclass b/classes/cpan.bbclass
index 506d4c4c81..5a0b4a5c92 100644
--- a/classes/cpan.bbclass
+++ b/classes/cpan.bbclass
@@ -50,16 +50,7 @@ cpan_do_compile () {
}
cpan_do_install () {
- if [ ${@is_target(d)} == "yes" ]; then
- oe_runmake install_vendor
- fi
-}
-
-cpan_do_stage () {
- if [ ${@is_target(d)} == "no" ]; then
- oe_runmake install_vendor
- fi
+ oe_runmake install_vendor
}
-
-EXPORT_FUNCTIONS do_configure do_compile do_install do_stage
+EXPORT_FUNCTIONS do_configure do_compile do_install
diff --git a/classes/insane.bbclass b/classes/insane.bbclass
index 52264e44b5..5ff49cd65e 100644
--- a/classes/insane.bbclass
+++ b/classes/insane.bbclass
@@ -341,7 +341,7 @@ def package_qa_check_staged(path,d):
pkgconfigcheck = workdir
else:
installed = "installed=yes"
- pkgconfigcheck = workdir
+ pkgconfigcheck = tmpdir
# find all .la and .pc files
# read the content