Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=eb5118e92d4cb750869c5e132df25299bbca8e6c
commit eb5118e92d4cb750869c5e132df25299bbca8e6c Author: Michel Hermier <[email protected]> Date: Tue Jun 22 14:24:32 2010 +0200 kde.sh * Partially revert back documentation handling. diff --git a/source/include/kde.sh b/source/include/kde.sh index 75dbd63..d4fe627 100644 --- a/source/include/kde.sh +++ b/source/include/kde.sh @@ -204,12 +204,15 @@ KDE_project_install() fi fi ## install the package + Fmessage "Installing main files for $1." make -C "$1" DESTDIR="$Fdestdir" install || Fdie ## install the documentation - if __kde_in_array "$pkgname-docs" "${subpk...@]}" \ - && [ -d $Fdestdir/usr/share/doc -a ! -d $startdir/pkg.$pkgname-docs/usr/share/doc ]; then + if __kde_in_array "$pkgname-docs" "${subpk...@]}"; then # documentation is in $pkgname-docs so ... - Fsplit "$pkgname-docs" usr/share/doc + if [ -d "$Fdestdir/usr/share/doc" ]; then +# Fsplit "$pkgname-docs" usr/share/doc + Frm usr/share/doc + fi else # documentation is per package so ... local path @@ -387,8 +390,7 @@ KDE_install() KDE_cleanup - if __kde_in_array "$pkgname-docs" "${subpk...@]}" \ - && [ -d $Fdestdir/usr/share/doc -a ! -d $startdir/pkg.$pkgname-docs/usr/share/doc ]; then + if __kde_in_array "$pkgname-docs" "${subpk...@]}" && [ -d $Fdestdir/usr/share/doc ]; then Fsplit "$pkgname-docs" usr/share/doc fi _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
