[oe-commits] Richard Purdie : chrpath: Ensure the package respects the docdir variable

[git version control]

Module: openembedded-core.git
Branch: master
Commit: 1b44053f6c4ac33d5058183e6634b1ba831ae601
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=1b44053f6c4ac33d5058183e6634b1ba831ae601

Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date:   Tue Jul  5 23:42:29 2011 +0100

chrpath: Ensure the package respects the docdir variable

This resolves unpackaged file QA warnings and an empty -doc package.

Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 .../chrpath/chrpath/standarddoc.patch              |   19 +++++++++++++++++++
 meta/recipes-devtools/chrpath/chrpath_0.13.bb      |    5 +++--
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-devtools/chrpath/chrpath/standarddoc.patch b/meta/recipes-devtools/chrpath/chrpath/standarddoc.patch
new file mode 100644
index 0000000..f96f104
--- /dev/null
+++ b/meta/recipes-devtools/chrpath/chrpath/standarddoc.patch
@@ -0,0 +1,19 @@
+Upstream-Status: Pending
+
+autoconf/automake set docdir automatically, use their value ensuring 
+doc files are placed into $datadir/doc, not $prefix/doc.
+
+RP 5/7/2011
+
+Index: chrpath-0.13/Makefile.am
+===================================================================
+--- chrpath-0.13.orig/Makefile.am	2011-07-05 23:40:14.769920254 +0100
++++ chrpath-0.13/Makefile.am	2011-07-05 23:40:19.819920635 +0100
+@@ -1,7 +1,5 @@
+ SUBDIRS = testsuite deb
+ 
+-docdir = $(prefix)/doc/$(PACKAGE)-$(VERSION)
+-
+ doc_DATA = AUTHORS COPYING ChangeLog INSTALL NEWS README
+ 
+ bin_PROGRAMS = chrpath
diff --git a/meta/recipes-devtools/chrpath/chrpath_0.13.bb b/meta/recipes-devtools/chrpath/chrpath_0.13.bb
index 200f444..d65725e 100644
--- a/meta/recipes-devtools/chrpath/chrpath_0.13.bb
+++ b/meta/recipes-devtools/chrpath/chrpath_0.13.bb
@@ -4,9 +4,10 @@ looks for libraries) in an application. It does not (yet) allow you to add an \
 rpath if there isn't one already."
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-PR = "r2"
+PR = "r3"
 
-SRC_URI = "${DEBIAN_MIRROR}/main/c/chrpath/chrpath_${PV}.orig.tar.gz"
+SRC_URI = "${DEBIAN_MIRROR}/main/c/chrpath/chrpath_${PV}.orig.tar.gz \
+        file://standarddoc.patch"
 
 SRC_URI[md5sum] = "b73072a8fbba277558c50364b65bb407"
 SRC_URI[sha256sum] = "c1aa5342eac0daad81b8da05aa282ae1ccd6f68bc75ca94064304f541eed071b"