[GRASS-SVN] r67180 - in grass/branches/releasebranch_7_0/gui/icons: . x86_64

[svn_grass at osgeo.org]

Author: martinl
Date: 2015-12-16 09:34:03 -0800 (Wed, 16 Dec 2015)
New Revision: 67180

Added:
   grass/branches/releasebranch_7_0/gui/icons/x86_64/
   grass/branches/releasebranch_7_0/gui/icons/x86_64/grass.ico
   grass/branches/releasebranch_7_0/gui/icons/x86_64/grass_osgeo.ico
Removed:
   grass/branches/releasebranch_7_0/gui/icons/grass64bit.ico
   grass/branches/releasebranch_7_0/gui/icons/grass64bit_osgeo.ico
   grass/branches/releasebranch_7_0/gui/icons/x86_64/grass.ico
   grass/branches/releasebranch_7_0/gui/icons/x86_64/grass_osgeo.ico
Modified:
   grass/branches/releasebranch_7_0/gui/icons/Makefile
Log:
icons: separate 64bit icons into separate directory
       (merge r67179 from trunk)


Modified: grass/branches/releasebranch_7_0/gui/icons/Makefile
===================================================================
--- grass/branches/releasebranch_7_0/gui/icons/Makefile	2015-12-16 17:18:06 UTC (rev 67179)
+++ grass/branches/releasebranch_7_0/gui/icons/Makefile	2015-12-16 17:34:03 UTC (rev 67180)
@@ -28,6 +28,10 @@
 	$(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 ($(filter x86_64,$(ARCH)),)
+	$(INSTALL_DATA) x86_64/grass.ico $(GUIDIR)/icons
+	$(INSTALL_DATA) x86_64/grass_osgeo.ico $(GUIDIR)/icons
+endif
 
 $(GUIDIR)/icons/%: % | $(DSTDIRS)
 	$(INSTALL_DATA) $< $@

Deleted: grass/branches/releasebranch_7_0/gui/icons/grass64bit.ico
===================================================================
(Binary files differ)

Deleted: grass/branches/releasebranch_7_0/gui/icons/grass64bit_osgeo.ico
===================================================================
(Binary files differ)

Deleted: grass/branches/releasebranch_7_0/gui/icons/x86_64/grass.ico
===================================================================
(Binary files differ)

Copied: grass/branches/releasebranch_7_0/gui/icons/x86_64/grass.ico (from rev 67179, grass/trunk/gui/icons/x86_64/grass.ico)
===================================================================
(Binary files differ)

Deleted: grass/branches/releasebranch_7_0/gui/icons/x86_64/grass_osgeo.ico
===================================================================
(Binary files differ)

Copied: grass/branches/releasebranch_7_0/gui/icons/x86_64/grass_osgeo.ico (from rev 67179, grass/trunk/gui/icons/x86_64/grass_osgeo.ico)
===================================================================
(Binary files differ)