From 58b704b108847c779bf8fef38bd523183207c1ae Mon Sep 17 00:00:00 2001 From: "nslu2-linux.adm@bkbits.net" Date: Thu, 24 Feb 2005 00:40:24 +0000 Subject: Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/02/23 18:20:11-06:00 ti.com!kergoth Add gnupg 1.4.0, consolidate common metadata into gnupg.inc, include some of the gnupg doc files in ${docdir}/${PN}/. Build 1.4.0 with readline support. Need to revisit what gnupg features we are compiling in, and perhaps disable some things to shrink the binary, and/or use the "minimal" configure option. 2005/02/23 18:16:53-06:00 ti.com!kergoth Path adjustments in cross and native bbclasses per the previous cset. 2005/02/23 18:14:30-06:00 ti.com!kergoth Fix infodir, mandir, and docdir variables to be relative to datadir, not prefix, and fix FILES_${PN}-doc to reference docdir rather than datadir/doc. BKrev: 421d2278QZWskeJqmJFXCyPjQutiuw --- classes/cross.bbclass | 6 +++--- classes/native.bbclass | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'classes') diff --git a/classes/cross.bbclass b/classes/cross.bbclass index 0f57fe5fd9..5d670ccadc 100644 --- a/classes/cross.bbclass +++ b/classes/cross.bbclass @@ -32,9 +32,9 @@ datadir = "${prefix}/share" sysconfdir = "${prefix}/etc" sharedstatedir = "${prefix}/com" localstatedir = "${prefix}/var" -infodir = "${prefix}/info" -mandir = "${prefix}/man" -docdir = "${prefix}/doc" +infodir = "${datadir}/info" +mandir = "${datadir}/man" +docdir = "${datadir}/doc" servicedir = "${prefix}/srv" # Architecture dependent paths diff --git a/classes/native.bbclass b/classes/native.bbclass index 32bd9dbae2..3391694838 100644 --- a/classes/native.bbclass +++ b/classes/native.bbclass @@ -37,9 +37,9 @@ base_libdir = "${base_prefix}/lib" sysconfdir = "${prefix}/etc" sharedstatedir = "${prefix}/com" localstatedir = "${prefix}/var" -infodir = "${prefix}/info" -mandir = "${prefix}/man" -docdir = "${prefix}/doc" +infodir = "${datadir}/info" +mandir = "${datadir}/man" +docdir = "${datadir}/doc" servicedir = "${prefix}/srv" # Architecture dependent paths -- cgit 1.2.3-korg