konevsa/branding-alt-virtualization-one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into school-junior

Browse Source
This commit is contained in:
Artem Zolochevskiy 2009-10-22 17:05:24 +03:00
commit 21a527fc49
6 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
branding.spec
View File

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

3
configure.ac
View File

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

2
indexhtml/index-en.html.in
View File

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

2
indexhtml/index-ru.html.in
View File

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

2
indexhtml/index-uk.html.in
View File

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

2
indexhtml/indexhtml.desktop.in
View File

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