expat: use INC_PR, set acpaths

Signed-off-by: Chris Larson <chris_larson@mentor.com>

diff --git a/recipes/expat/expat.inc b/recipes/expat/expat.inc
index b254f08..bc56828 100644 (file)
--- a/recipes/expat/expat.inc
+++ b/recipes/expat/expat.inc
@@ -11,3 +11,5 @@ export LTCC = "${CC}"
 
 inherit autotools
 
+acpaths =+ "-I${S}/conftools"
+INC_PR = "r3"

diff --git a/recipes/expat/expat_1.95.6.bb b/recipes/expat/expat_1.95.6.bb
index 64eb2a7..aaf6a07 100644 (file)
--- a/recipes/expat/expat_1.95.6.bb
+++ b/recipes/expat/expat_1.95.6.bb
@@ -1,6 +1,5 @@
 require expat.inc
-
-PR = "r2"
+PR = "${INC_PR}.0"
 
 do_install () {
        oe_runmake prefix="${D}${prefix}" \

diff --git a/recipes/expat/expat_1.95.7.bb b/recipes/expat/expat_1.95.7.bb
index 61b2c5d..d78fd67 100644 (file)
--- a/recipes/expat/expat_1.95.7.bb
+++ b/recipes/expat/expat_1.95.7.bb
@@ -1,5 +1,5 @@
 require expat.inc
-PR = "r3"
+PR = "${INC_PR}.0"
 
 SRC_URI += "file://autotools.patch \
            file://expat-XMLCALL.patch \

diff --git a/recipes/expat/expat_2.0.1.bb b/recipes/expat/expat_2.0.1.bb
index 5ff9f1e..63d3421 100644 (file)
--- a/recipes/expat/expat_2.0.1.bb
+++ b/recipes/expat/expat_2.0.1.bb
@@ -1,5 +1,5 @@
 require expat.inc
-PR = "r3"
+PR = "${INC_PR}.0"
 
 BBCLASSEXTEND = "native nativesdk"