diff options
| author | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-02-24 00:40:24 +0000 |
|---|---|---|
| committer | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-02-24 00:40:24 +0000 |
| commit | 58b704b108847c779bf8fef38bd523183207c1ae (patch) | |
| tree | 40330a1c0f651134037f3240f2052cb852a218b3 /conf/bitbake.conf | |
| parent | 90e37d1057ac53c35b542acd4ad953ba8f2ba403 (diff) | |
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
Diffstat (limited to 'conf/bitbake.conf')
| -rw-r--r-- | conf/bitbake.conf | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf index aa5874225c..d7574fc013 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -17,9 +17,9 @@ export datadir = "${prefix}/share" export sysconfdir = "/etc" export sharedstatedir = "${prefix}/com" export localstatedir = "/var" -export infodir = "${prefix}/info" -export mandir = "${prefix}/man" -export docdir = "${prefix}/doc" +export infodir = "${datadir}/info" +export mandir = "${datadir}/man" +export docdir = "${datadir}/doc" export servicedir = "/srv" # Architecture dependent paths @@ -102,7 +102,7 @@ FILES_${PN} = "${bindir} ${sbindir} ${libexecdir} ${libdir}/lib*.so.* \ ${datadir}/idl ${datadir}/omf ${datadir}/sounds \ ${libdir}/bonobo/servers" SECTION_${PN}-doc = "doc" -FILES_${PN}-doc = "${datadir}/doc ${mandir} ${infodir} ${datadir}/gtk-doc \ +FILES_${PN}-doc = "${docdir} ${mandir} ${infodir} ${datadir}/gtk-doc \ ${datadir}/gnome/help" SECTION_${PN}-dev = "devel" FILES_${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la \ |