diff options
| -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 |