From b5f288ab23925e830df5473855b1868e15ff9487 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 5 Jul 2011 23:42:29 +0100 Subject: chrpath: Ensure the package respects the docdir variable This resolves unpackaged file QA warnings and an empty -doc package. (From OE-Core rev: 1b44053f6c4ac33d5058183e6634b1ba831ae601) Signed-off-by: Richard Purdie --- .../chrpath/chrpath/standarddoc.patch | 19 +++++++++++++++++++ meta/recipes-devtools/chrpath/chrpath_0.13.bb | 5 +++-- 2 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-devtools/chrpath/chrpath/standarddoc.patch (limited to 'meta/recipes-devtools/chrpath') diff --git a/meta/recipes-devtools/chrpath/chrpath/standarddoc.patch b/meta/recipes-devtools/chrpath/chrpath/standarddoc.patch new file mode 100644 index 0000000000..f96f104fad --- /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 200f4446b7..d65725eb06 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" -- cgit v1.2.3-54-g00ecf