Merge branch 'master' into school-server

branding.spec

@@ -196,16 +196,6 @@ popd
 mkdir -p %buildroot/usr/share/install2/slideshow
 install slideshow/*  %buildroot/usr/share/install2/slideshow/
 
-#indexhtml
-%define _indexhtmldir %_defaultdocdir/indexhtml
-pushd indexhtml
-mkdir -p %buildroot{%_indexhtmldir/,%_desktopdir/}
-cp -r * %buildroot%_indexhtmldir/
-rm -f %buildroot%_indexhtmldir/*.in %buildroot%_indexhtmldir/indexhtml.desktop
-touch %buildroot%_indexhtmldir/index.html
-install -m644 indexhtml.desktop %buildroot%_desktopdir/
-popd
-
 #bootloader
 %pre bootloader
 [ -s /boot/splash/%theme ] && rm -fr  /boot/splash/%theme ||:
@@ -264,7 +254,7 @@ echo $lang > lang
 %files slideshow
 /usr/share/install2/slideshow
 
-%define indexhtmldir %_datadir/doc/alt-docs/indexhtml
+%define indexhtmldir %_defaultdocdir/indexhtml
 
 %files indexhtml
 %ghost %indexhtmldir/index.html

components.mk

@@ -47,7 +47,7 @@ boot:
 	install -m 644 design-bootloader-source/bootlogo $(datadir)/gfxboot/$(THEME)
 
 # index html page, start page for all local browsers
-INDEXHTML_DIR=$(datadir)/doc/alt-docs/indexhtml
+INDEXHTML_DIR=$(datadir)/doc/indexhtml
 indexhtml:
 	for i in notes/index*.html components/indexhtml/*.css;do \
 	  install -Dpm644 $$i $(INDEXHTML_DIR)/`basename $$i`; \

configure.ac

@@ -19,6 +19,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)
@@ -26,6 +28,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)