diff options
| author | Maciej Mrozowski <reavertm@gentoo.org> | 2010-05-17 00:59:57 +0200 |
|---|---|---|
| committer | Maciej Mrozowski <reavertm@gentoo.org> | 2010-05-17 03:13:22 +0200 |
| commit | 0105d107b72e10c1a0883bf9925e436e6d73e3ce (patch) | |
| tree | e7f50a7bc716f555a2d6b0c7e6020cb6844ecb92 /eclass | |
| parent | cab29814e4066f644080a2528c4072fc69311576 (diff) | |
| download | kde-0105d107b72e10c1a0883bf9925e436e6d73e3ce.tar.gz kde-0105d107b72e10c1a0883bf9925e436e6d73e3ce.tar.bz2 kde-0105d107b72e10c1a0883bf9925e436e6d73e3ce.zip | |
[eclass/kde4-base] Fix README's installation for kdelibs/kdepimlibs
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/kde4-base.eclass | 17 | ||||
| -rw-r--r-- | eclass/kde4-meta.eclass | 6 |
2 files changed, 8 insertions, 15 deletions
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass index 3cb4a18d1b8..fef37d4f282 100644 --- a/eclass/kde4-base.eclass +++ b/eclass/kde4-base.eclass @@ -725,19 +725,12 @@ kde4-base_src_install() { # Install common documentation of KDE4 applications local doc if ! has kde4-meta ${INHERITED}; then - for doc in AUTHORS ChangeLog* README* NEWS TODO HACKING; do - [[ -s "${S}/${doc}" ]] && dodoc "${doc}" + for doc in "${S}"/{AUTHORS,CHANGELOG,ChangeLog*,README*,NEWS,TODO,HACKING}; do + [[ -s "${doc}" ]] && dodoc "${doc}" + done + for doc in "${S}"/*/{AUTHORS,CHANGELOG,ChangeLog*,README*,NEWS,TODO,HACKING}; do + [[ -s "${doc}" ]] && newdoc "${doc}" "$(basename $(dirname ${doc})).$(basename ${doc})" done - # kdelibs, kdepimlibs - if [[ -z ${KMNAME} ]]; then - for doc in "${S}"/*/{AUTHORS,ChangeLog*,README*,NEWS,TODO,HACKING}; do - if [[ -s "${S}/${doc}" ]]; then - local doc_complete=${doc} - doc="${doc#*/}" - newdoc "$doc_complete" "${doc%/*}.${doc##*/}" - fi - done - fi fi cmake-utils_src_install diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass index 0d3e62fb7b9..fe11c493ae9 100644 --- a/eclass/kde4-meta.eclass +++ b/eclass/kde4-meta.eclass @@ -711,10 +711,10 @@ kde4-meta_src_test() { kde4-meta_src_install() { debug-print-function $FUNCNAME "$@" - # Search ${S}/${KMMODULE} and install any "AUTHORS ChangeLog* README* NEWS TODO HACKING" found + # Search ${S}/${KMMODULE} and install common documentation files found local doc - for doc in AUTHORS ChangeLog* README* NEWS TODO HACKING; do - [[ -s "${S}/${KMMODULE}/${doc}" ]] && dodoc "${S}/${KMMODULE}/${doc}" + for doc in "${S}/${KMMODULE}"/{AUTHORS,CHANGELOG,ChangeLog*,README*,NEWS,TODO,HACKING}; do + [[ -s "${doc}" ]] && dodoc "${doc}" done kde4-base_src_install |