original grass icons moved to gui/icons/grass

silk icons copied to etc/gui/icons/silk and docs/html/icons/silk
lib/init: ICO files moved to gui/icons, intro image to gui/images
(merge from devbr6, https://trac.osgeo.org/grass/changeset/32741 and https://trac.osgeo.org/grass/changeset/32743)


git-svn-id: https://svn.osgeo.org/grass/grass/trunk@32745 15284696-431f-4ddb-bdfa-cd5b030d7da7

gui/Makefile

@@ -1,6 +1,6 @@
 MODULE_TOPDIR = ..
 
-SUBDIRS = icons scripts xml tcltk wxpython
+SUBDIRS = icons images scripts xml tcltk wxpython
 
 include $(MODULE_TOPDIR)/include/Make/Platform.make
 
@@ -9,4 +9,3 @@ include $(MODULE_TOPDIR)/include/Make/Dir.make
 default: parsubdirs
 
 clean: cleansubdirs
-

gui/icons/Makefile

@@ -2,15 +2,19 @@ MODULE_TOPDIR = ../..
 
 include $(MODULE_TOPDIR)/include/Make/Dir.make
 
-default:
-	if [ ! -d $(GISBASE)/etc/gui ] ; then $(MKDIR) $(GISBASE)/etc/gui ; fi
-	if [ ! -d $(GISBASE)/etc/gui/icons ] ; then $(MKDIR) $(GISBASE)/etc/gui/icons ; fi
-	@# if [ ! -d $(GISBASE)/etc/gui/icons/silk ] ; then $(MKDIR) $(GISBASE)/etc/gui/icons/silk ; fi
-	for icon in *.gif ; do $(INSTALL_DATA) $$icon $(GISBASE)/etc/gui/icons ; done
-	@# for icon in silk/*.png ; do $(INSTALL_DATA) $$icon $(GISBASE)/etc/gui/icons/silk ; done
+default: $(ICONS)
+	if [ ! -d $(ETC)/gui ] ; then $(MKDIR) $(ETC)/gui ; fi
+	if [ ! -d $(ETC)/gui/icons ] ; then $(MKDIR) $(ETC)/gui/icons ; fi
+	if [ ! -d $(ETC)/gui/icons/grass ] ; then $(MKDIR) $(ETC)/gui/icons/grass ; fi
+	if [ ! -d $(ETC)/gui/icons/silk ] ; then $(MKDIR) $(ETC)/gui/icons/silk ; fi
+	for icon in grass/*.gif ; do $(INSTALL_DATA) $$icon $(ETC)/gui/icons/grass ; done
+	for icon in silk/*.png ; do $(INSTALL_DATA) $$icon $(ETC)/gui/icons/silk ; done
+	for icon in *.ico ; do $(INSTALL_DATA) $$icon $(ETC)/gui/icons ; done
 	if [ ! -d $(GISBASE)/docs ] ; then $(MKDIR) $(GISBASE)/docs ; fi
 	if [ ! -d $(GISBASE)/docs/html ] ; then $(MKDIR) $(GISBASE)/docs/html ; fi
 	if [ ! -d $(GISBASE)/docs/html/icons ] ; then $(MKDIR) $(GISBASE)/docs/html/icons ; fi
+	if [ ! -d $(GISBASE)/docs/html/icons/grass ] ; then $(MKDIR) $(GISBASE)/docs/html/icons/grass ; fi
 	if [ ! -d $(GISBASE)/docs/html/icons/silk ] ; then $(MKDIR) $(GISBASE)/docs/html/icons/silk ; fi
-	for icon in *.gif ; do $(INSTALL_DATA) $$icon $(GISBASE)/docs/html/icons ; done
+	for icon in grass/*.gif ; do $(INSTALL_DATA) $$icon $(GISBASE)/docs/html/icons/grass ; done
 	for icon in silk/*.png ; do $(INSTALL_DATA) $$icon $(GISBASE)/docs/html/icons/silk ; done
+