diff --git a/branding.spec b/branding.spec index 0e6db0f..dbcc265 100644 --- a/branding.spec +++ b/branding.spec @@ -218,8 +218,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/ diff --git a/configure.ac b/configure.ac index bf59e7d..5115790 100644 --- a/configure.ac +++ b/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) diff --git a/indexhtml/index-en.html.in b/indexhtml/index-en.html.in index 70e48ce..048c460 100644 --- a/indexhtml/index-en.html.in +++ b/indexhtml/index-en.html.in @@ -56,7 +56,7 @@

Documentation

diff --git a/indexhtml/index-ru.html.in b/indexhtml/index-ru.html.in index 889f5cd..93160d4 100644 --- a/indexhtml/index-ru.html.in +++ b/indexhtml/index-ru.html.in @@ -47,7 +47,7 @@

Документация

diff --git a/indexhtml/index-uk.html.in b/indexhtml/index-uk.html.in index 05bda4c..1fa8c0c 100644 --- a/indexhtml/index-uk.html.in +++ b/indexhtml/index-uk.html.in @@ -57,7 +57,7 @@

Документація (рос.)

diff --git a/indexhtml/indexhtml.desktop.in b/indexhtml/indexhtml.desktop.in index 323805e..bdfaa3d 100644 --- a/indexhtml/indexhtml.desktop.in +++ b/indexhtml/indexhtml.desktop.in @@ -1,7 +1,7 @@ [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@: start page