sync grass icons from trunk (new version done by Vincent Bain)

git-svn-id: https://svn.osgeo.org/grass/grass/branches/releasebranch_7_0@67966 15284696-431f-4ddb-bdfa-cd5b030d7da7

gui/icons/Makefile

@@ -28,10 +28,11 @@ default: $(ETCICONS) $(HTMLICONS)
 	$(INSTALL_DATA) grass.svg $(ARCH_DISTDIR)/share/icons/hicolor/scalable/apps/grass70.svg
 	$(MKDIR) $(ARCH_DISTDIR)/share/appdata
 	$(INSTALL_DATA) grass.appdata.xml $(ARCH_DISTDIR)/share/appdata
-ifeq ($(findstring x86_64,$(ARCH)),x86_64)
-	$(INSTALL_DATA) x86_64/grass.ico $(GUIDIR)/icons
-	$(INSTALL_DATA) x86_64/grass_osgeo.ico $(GUIDIR)/icons
-endif
+### disable special 64bit icons (using different icons can be confusing for the user)
+# ifeq ($(findstring x86_64,$(ARCH)),x86_64)
+# 	$(INSTALL_DATA) x86_64/grass.ico $(GUIDIR)/icons
+# 	$(INSTALL_DATA) x86_64/grass_osgeo.ico $(GUIDIR)/icons
+# endif
 
 $(GUIDIR)/icons/%: % | $(DSTDIRS)
 	$(INSTALL_DATA) $< $@