Merge branch 'master' into P5-desktop

branding.spec

@@ -283,8 +283,7 @@ mkdir -p %buildroot/usr/share/install2/slideshow
 install slideshow/*  %buildroot/usr/share/install2/slideshow/
 
 #indexhtml
-%define _altdocsdir %_defaultdocdir/alt-docs
-%define _indexhtmldir %_altdocsdir/indexhtml
+%define _indexhtmldir %_defaultdocdir/indexhtml
 pushd indexhtml
 mkdir -p %buildroot{%_indexhtmldir/,%_desktopdir/}
 cp -r * %buildroot%_indexhtmldir/

configure.ac

@@ -14,6 +14,8 @@ LIGHT_COLOR_DEC=`./color_dec ${LIGHT_COLOR_HEX}`
 MIDDLE_COLOR_DEC=`./color_dec ${MIDDLE_COLOR_HEX}`
 DARK_COLOR_DEC=`./color_dec ${DARK_COLOR_HEX}`
 
+DOCDIR=documentation
+
 AC_SUBST(THEME)
 AC_SUBST(NAME)
 AC_SUBST(BRAND)
@@ -21,6 +23,7 @@ AC_SUBST(BRAND_FNAME)
 AC_SUBST(STATUS)
 AC_SUBST(STATUS_EN)
 AC_SUBST(VERSION)
+AC_SUBST(DOCDIR)
 AC_SUBST(PROGRESS_COLOR)
 AC_SUBST(LIGHT_COLOR_HEX)
 AC_SUBST(MIDDLE_COLOR_HEX)

indexhtml/index-en.html.in

@@ -56,7 +56,7 @@
 <div id="documentation">
 <h2>Documentation</h2>
 <ul>
- <li><a href="../../@THEME@/index.html">User manual</a></li>
+ <li><a href="../@DOCDIR@/index.html">User manual</a></li>
 </ul>
 </div>
 

indexhtml/index-ru.html.in

@@ -47,7 +47,7 @@
 <div id="documentation">
 <h2>Документация</h2>
 <ul>
- <li><a href="../../@THEME@/index.html">Руководство пользователя</a></li>
+ <li><a href="../@DOCDIR@/index.html">Руководство пользователя</a></li>
 </ul>
 </div>
 

indexhtml/index-uk.html.in

@@ -57,7 +57,7 @@
 <div id="documentation">
 <h2>Документація (рос.)</h2>
 <ul>
- <li><a href="../../@THEME@/index.html">Посібник користувача</a></li>
+ <li><a href="../@DOCDIR@/index.html">Посібник користувача</a></li>
 </ul>
 </div>
 

indexhtml/indexhtml.desktop.in

 [Desktop Entry]
 Version=1.0
 Type=Application
-Exec=xdg-open /usr/share/doc/alt-docs/indexhtml/index.html
+Exec=xdg-open /usr/share/doc/indexhtml/index.html
 StartupNotify=false
 Icon=altlinux
 Name=@BRAND_FNAME@ @VERSION@ @NAME@ @STATUS@: start page