Move all install instructions from notes/Makefile and spec file to Makefile.in

Makefile.in

 STATUS=@STATUS@
+BRAND=@BRAND@
 THEME=@THEME@
 NAME=@NAME@
 VERSION=@VERSION@
 
-.PHONY: graphics browser-qt ahttpd boot-images boot-splash boot indexhtml
+.PHONY: graphics browser-qt ahttpd boot-images boot-splash boot indexhtml install education-install
 
 # graphics
 
@@ -110,4 +111,85 @@ indexhtml: indexhtml/index.css
 	install -Dpm755 indexhtml/indexhtml.desktop $(datadir)/kde4/apps/kio_desktop/DesktopLinks/indexhtml.desktop
 
 all: graphics
-install: browser-qt ahttpd boot-images boot-splash @X86@ indexhtml
+
+education-install:
+	# install product icon
+	for size in 16 22 24 32 48 64 128; do \
+	    install -Dm 0644 icons/alt-education-$$size.png $(datadir)/icons/hicolor/$${size}x$${size}/apps/alt-education.png; \
+	done
+	install -Dm 0644 kde-settings/Education.profile $(datadir)/kf5/konsole/Education.profile
+	install -Dm 0644 kde-settings/konsolerc $(sysconfdir)/skel/.config/konsolerc
+
+install: browser-qt ahttpd boot-images boot-splash @X86@ indexhtml education-install
+	install -d $(datadir)/design/{$(THEME),backgrounds}
+	install -d $(datadir)/icons/hicolor/32x32/apps
+	cp -a backgrounds icons faces $(datadir)/design/$(THEME)
+	ln -s ../../../wallpapers $(datadir)/design/$(THEME)/backgrounds/more
+	install -d $(sysconfdir)/alternatives/packages.d
+	echo "/usr/share/design-current	/usr/share/design/$(THEME)	000012000000" >> $(sysconfdir)/alternatives/packages.d/branding-$(BRAND)-$(THEME)-graphics
+	echo "/usr/share/design/current	/usr/share/design/$(THEME)	000012000000" >> $(sysconfdir)/alternatives/packages.d/branding-$(BRAND)-$(THEME)-graphics
+	#release
+	mkdir -p $(sysconfdir)/buildreqs/packages/ignore.d/
+	install -pD -m644 /dev/null $(sysconfdir)/buildreqs/packages/ignore.d/$(BRAND)-$(THEME)-release
+	echo "%distro_name (%codename)" >$(sysconfdir)/altlinux-release
+	for n in fedora redhat system; do \
+	    ln -s altlinux-release $(sysconfdir)/$$n-release; \
+	done
+	install -pD -m644 systemd/os-release $(sysconfdir)/os-release
+	#notes
+	cd notes; \
+	install -d $(datadir)/alt-notes; \
+	cp -a *.html $(datadir)/alt-notes; \
+	for relnotes in release-notes.*.html; do \
+	    suffix="$${relnotes#release-notes.}"; \
+	    ln -s $$relnotes $(datadir)/alt-notes/livecd-finish.$$suffix; \
+	done; \
+	cd ..
+	#kde-settings
+	cd kde-settings; \
+	mkdir -p $(sysconfdir)/skel/.kde4; \
+	cp -a kde4/* $(sysconfdir)/skel/.kde4/; \
+	mkdir -p $(sysconfdir)/kde4/xdg/menus/applications-merged/; \
+	install -m 0644 menu/*.menu $(sysconfdir)/kde4/xdg/menus/applications-merged/; \
+	install -Dm 0644 nm-applet.desktop $(sysconfdir)/skel/.config/autostart/nm-applet.desktop; \
+	cd ..
+	#fwvm-settings
+	mkdir -p $(sysconfdir)/skel
+	install -m 644 fvwm-settings/.fvwm2rc $(sysconfdir)/skel/
+	#mate-settings
+	cd mate-settings; \
+	install -Dm644 50_mate-background.gschema.override $(datadir)/glib-2.0/schemas/50_mate-background.gschema.override; \
+	install -Dm644 60_mate-theme.gschema.override $(datadir)/glib-2.0/schemas/60_mate-theme.gschema.override; \
+	install -Dm644 Trolltech.conf $(sysconfdir)/skel/.config/Trolltech.conf; \
+	cd ..
+	install -d $(sysconfdir)/skel
+	cp -r xfce-settings/etcskel/XDG-Templates.skel $(sysconfdir)/skel/
+	cp -r xfce-settings/etcskel/.[a-z]* $(sysconfdir)/skel/
+	install -Dm 644 xfce-settings/etcskel/registrymodifications.xcu $(sysconfdir)/skel/.config/libreoffice/4/user/registrymodifications.xcu
+	install -pDm0755 xfce-settings/scripts/zdg-move-templates.sh $(sysconfdir)/X11/profile.d/zdg-move-templates.sh
+	install -Dm 644 gnome-settings/gtkrc-2 $(sysconfdir)/skel/.gtkrc-2.0
+	install -Dm 644 gnome-settings/gtk3-settings.ini $(sysconfdir)/skel/.config/gtk-3.0/settings.ini
+	#slideshow
+	mkdir -p $(datadir)/install2/slideshow
+	mkdir -p $(sysconfdir)/alterator
+	cp -a slideshow/* $(datadir)/install2/slideshow/
+	install slideshow/slideshow.conf $(sysconfdir)/alterator/
+	# Set English slideshow as default
+	#ln -s slides-en $(datadir)/install2/slideshow/slides
+	#indexhtml
+	install -d $(datadir)/doc/indexhtml
+	cp -a indexhtml/{*.html,images} $(datadir)/doc/indexhtml
+	install -Dm755 indexhtml/indexhtml.desktop $(datadir)/kde4/apps/kio_desktop/DesktopLinks/indexhtml.desktop
+	install -Dm755 indexhtml/indexhtml.desktop $(datadir)/kf5/kio_desktop/DesktopLinks/indexhtml.desktop
+	install -Dm755 indexhtml/indexhtml.desktop $(datadir)/Desktop/indexhtml.desktop
+	#menu
+	mkdir -p $(datadir)/slinux-style/applications
+	install menu/applications/* $(datadir)/slinux-style/applications/
+	mkdir -p $(sysconfdir)/xdg/menus/xfce-applications-merged
+	cp menu/50-xfce-applications.menu $(sysconfdir)/xdg/menus/xfce-applications-merged/
+	mkdir -p $(datadir)/desktop-directories
+	cp menu/altlinux-wine.directory $(datadir)/desktop-directories/
+	# system-settings
+	mkdir -p $(sysconfdir)/polkit-1/rules.d/
+	cp -a system-settings/polkit-rules/*.rules $(sysconfdir)/polkit-1/rules.d/
+	#install -Dm644 system-settings/ldm_pam_environment $(localstatedir)/ldm/.pam_environment

branding.spec

@@ -297,128 +297,6 @@ make
 %install
 %makeinstall
 
-#graphics
-mkdir -p %buildroot/%_datadir/design/{%theme,backgrounds}
-mkdir -p %buildroot/%_niconsdir
-cp -ar backgrounds icons faces %buildroot/%_datadir/design/%theme
-
-pushd %buildroot/%_datadir/design/%theme
-    pushd backgrounds
-	ln -sf ../../../wallpapers more
-    popd
-popd
-
-# install product icon
-for size in 16 22 24 32 48 64 128; do
-	install -Dm 0644 icons/alt-education-$size.png %buildroot%_iconsdir/hicolor/${size}x${size}/apps/alt-education.png
-done
-
-GRAPHICS_ALTPRIO=`printf '%%.3d%%.3d%%.3d%%.3d\n' %design_graphics_abi_epoch %design_graphics_abi_major %design_graphics_abi_minor %design_graphics_abi_bugfix`
-install -d %buildroot//etc/alternatives/packages.d
-cat >%buildroot/etc/alternatives/packages.d/%name-graphics <<__EOF__
-%_datadir/design-current	%_datadir/design/%theme	$GRAPHICS_ALTPRIO
-%_datadir/design/current	%_datadir/design/%theme	$GRAPHICS_ALTPRIO
-__EOF__
-
-
-#release
-mkdir -p %buildroot%_sysconfdir/buildreqs/packages/ignore.d/
-install -pD -m644 /dev/null %buildroot%_sysconfdir/buildreqs/packages/ignore.d/%name-release
-echo "%distro_name (%codename)" >%buildroot%_sysconfdir/altlinux-release
-for n in fedora redhat system; do
-	ln -s altlinux-release %buildroot%_sysconfdir/$n-release
-done
-install -pD -m644 systemd/os-release %buildroot%_sysconfdir/os-release
-
-#notes
-pushd notes
-%makeinstall
-popd
-
-#kde-settings
-pushd kde-settings
-mkdir -p %buildroot%_sysconfdir/skel/.kde4
-cp -a kde4/* %buildroot%_sysconfdir/skel/.kde4/
-mkdir -p %buildroot%_sysconfdir/kde4/xdg/menus/applications-merged/
-install -m 0644 menu/*.menu %buildroot%_sysconfdir/kde4/xdg/menus/applications-merged/
-install -Dm 0644 Education.profile %buildroot%_datadir/kf5/konsole/Education.profile
-install -Dm 0644 konsolerc %buildroot%_sysconfdir/skel/.config/konsolerc
-install -Dm 0644 nm-applet.desktop %buildroot%_sysconfdir/skel/.config/autostart/nm-applet.desktop
-popd
-
-# disable annoing autostart
-mkdir -p %buildroot/%_sysconfdir/skel/.config/autostart/
-for n in tracker-extract tracker-miner-apps tracker-miner-fs tracker-miner-user-guides tracker-store ; do
-    echo -e "[Desktop Entry]\nHidden=true" > %buildroot%_sysconfdir/skel/.config/autostart/$n.desktop
-done
-# disable annoing menus
-mkdir -p %buildroot/%_sysconfdir/skel/.local/share/applications/
-for n in gnome-mplayer mplayer gmplayer ; do
-    echo -e "[Desktop Entry]\nHidden=true" > %buildroot/%_sysconfdir/skel/.local/share/applications/$n.desktop
-done
-
-ln -s license.ru.html %buildroot%_datadir/alt-notes/license.uk.html
-
-#fwvm-settings
-mkdir -p %buildroot/etc/skel
-install -m 644 fvwm-settings/.fvwm2rc %buildroot/etc/skel/
-
-#mate-settings
-pushd mate-settings
-install -m 644 -D 50_mate-background.gschema.override '%buildroot%_datadir/glib-2.0/schemas/50_mate-background.gschema.override'
-install -m 644 -D 60_mate-theme.gschema.override '%buildroot%_datadir/glib-2.0/schemas/60_mate-theme.gschema.override'
-install -m 644 -D Trolltech.conf '%buildroot%_sysconfdir/skel/.config/Trolltech.conf'
-popd
-
-mkdir -p %buildroot/etc/skel/XDG-Templates.skel/
-
-cp -r xfce-settings/etcskel/* %buildroot/etc/skel/
-cp -r xfce-settings/etcskel/.config %buildroot/etc/skel/
-cp -r xfce-settings/etcskel/.face %buildroot/etc/skel/
-cp -r xfce-settings/etcskel/.gconf %buildroot/etc/skel/
-cp -r xfce-settings/etcskel/.local %buildroot/etc/skel/
-cp -r xfce-settings/etcskel/.vimrc %buildroot/etc/skel/
-
-install -m 644 xfce-settings/etcskel/.wm-select %buildroot/etc/skel/
-install -Dm 644 xfce-settings/etcskel/registrymodifications.xcu %buildroot/etc/skel/.config/libreoffice/4/user/registrymodifications.xcu
-
-install -pDm0755 xfce-settings/scripts/zdg-move-templates.sh %buildroot%_sysconfdir/X11/profile.d/zdg-move-templates.sh
-
-install -Dm 644 gnome-settings/gtkrc-2 %buildroot/etc/skel/.gtkrc-2.0
-install -Dm 644 gnome-settings/gtk3-settings.ini %buildroot/etc/skel/.config/gtk-3.0/settings.ini
-
-#slideshow
-mkdir -p %buildroot/usr/share/install2/slideshow
-mkdir -p %buildroot/etc/alterator
-cp -a slideshow/*  %buildroot/usr/share/install2/slideshow/
-install slideshow/slideshow.conf %buildroot/etc/alterator/
-# Set English slideshow as default
-#ln -s slides-en %buildroot/usr/share/install2/slideshow/slides
-
-#indexhtml
-%define _altdocsdir %_defaultdocdir/alt-docs
-%define _indexhtmldir %_defaultdocdir/indexhtml
-install -d %buildroot%_indexhtmldir
-install indexhtml/*.html %buildroot%_defaultdocdir/indexhtml/
-mkdir -p %buildroot%_defaultdocdir/indexhtml/images
-install indexhtml/images/* %buildroot%_defaultdocdir/indexhtml/images/
-install -Dm755 indexhtml/indexhtml.desktop %buildroot%_datadir/kde4/apps/kio_desktop/DesktopLinks/indexhtml.desktop
-install -Dm755 indexhtml/indexhtml.desktop %buildroot%_datadir/kf5/kio_desktop/DesktopLinks/indexhtml.desktop
-install -Dm755 indexhtml/indexhtml.desktop %buildroot%_datadir/Desktop/indexhtml.desktop
-
-#menu
-mkdir -p %buildroot/usr/share/slinux-style/applications
-install menu/applications/* %buildroot/usr/share/slinux-style/applications/
-mkdir -p %buildroot/etc/xdg/menus/xfce-applications-merged
-cp menu/50-xfce-applications.menu %buildroot/etc/xdg/menus/xfce-applications-merged/
-mkdir -p %buildroot/usr/share/desktop-directories
-cp menu/altlinux-wine.directory %buildroot/usr/share/desktop-directories/
-
-# system-settings
-mkdir -p %buildroot/%_sysconfdir/polkit-1/rules.d/
-cp -a system-settings/polkit-rules/*.rules %buildroot/%_sysconfdir/polkit-1/rules.d/
-#install -Dm644 system-settings/ldm_pam_environment %buildroot%_localstatedir/ldm/.pam_environment
-
 #bootloader
 %pre bootloader
 [ -s /usr/share/gfxboot/%theme ] && rm -fr  /usr/share/gfxboot/%theme ||:
@@ -522,8 +400,8 @@ subst 's/#theme-name=/theme-name=Clearlooks-Phenix/' /etc/lightdm/lightdm-gtk-gr
 %define indexhtmldir %_defaultdocdir/indexhtml
 
 %files indexhtml
-%ghost %_indexhtmldir/index.html
-%_indexhtmldir/*
+%ghost %_defaultdocdir/indexhtml/index.html
+%_defaultdocdir/indexhtml/*
 %_desktopdir/*
 %_datadir/kde4/apps/kio_desktop/DesktopLinks/indexhtml.desktop
 %_datadir/kf5/kio_desktop/DesktopLinks/indexhtml.desktop

notes/Makefile

-
-install:
-	install -d $(datadir)/alt-notes
-	cp -a *.html $(datadir)/alt-notes
-	for relnotes in release-notes.*.html; do \
-		suffix="$${relnotes#release-notes.}"; \
-		ln -s $$relnotes $(datadir)/alt-notes/livecd-finish.$$suffix; \
-	done