From: John Darrington <john@darrington.wattle.id.au>
Date: Sat, 27 Jul 2013 15:54:06 +0000 (+0200)
Subject: Replace legacy application icon by new one
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d8f93cb83eaba37dfeba8dbdf07b352d3fa559af;p=pspp

Replace legacy application icon by new one
---

diff --git a/src/ui/gui/app-icons/16x16/pspp.png b/src/ui/gui/app-icons/16x16/pspp.png
deleted file mode 100644
index f8ed8bbbf6..0000000000
Binary files a/src/ui/gui/app-icons/16x16/pspp.png and /dev/null differ
diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index 95f0a0fe90..b0eb0aeff3 100644
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -107,10 +107,8 @@ install-lang:
 
 install-legacy-icons:
 	for size in 16x16 ; do \
-	  $(MKDIR_P) $(thetemedir)/$$size/$(thecontext) ; \
+	  $(MKDIR_P) $(thethemedir)/$$size/$(thecontext) ; \
           $(INSTALL_DATA) $(top_srcdir)/src/ui/gui/icons/$$size/* $(thethemedir)/$$size/$(thecontext) ; \
-	  $(MKDIR_P) $(thethemedir)/$$size/apps ; \
-	  $(INSTALL_DATA) $(top_srcdir)/src/ui/gui/app-icons/$$size/pspp.png $(thethemedir)/$$size/apps ; \
 	done 
 
 INSTALL_DATA_HOOKS += install-legacy-icons install-lang
@@ -118,7 +116,6 @@ INSTALL_DATA_HOOKS += install-legacy-icons install-lang
 uninstall-legacy-icons:
 	for size in 16x16 ; do \
           rm -r -f $(thethemedir)/$$size/$(thecontext); \
-          rm -f $(thethemedir)/$$size/apps/pspp.png; \
 	done 
 
 update-icon-cache:
@@ -130,7 +127,6 @@ UNINSTALL_DATA_HOOKS += uninstall-legacy-icons
 
 dist_src_ui_gui_psppire_DATA = \
 	$(UI_FILES) \
-	$(top_srcdir)/src/ui/gui/app-icons/16x16/pspp.png \
 	$(top_srcdir)/src/ui/gui/pspp.lang \
 	$(top_srcdir)/src/ui/gui/pspplogo.png \
 	$(top_srcdir)/src/ui/gui/icons/value-labels.png \
diff --git a/src/ui/gui/icons/automake.mk b/src/ui/gui/icons/automake.mk
index 2d304af02d..c2bc16bfd1 100644
--- a/src/ui/gui/icons/automake.mk
+++ b/src/ui/gui/icons/automake.mk
@@ -8,8 +8,8 @@ sizes=16x16 22x22  24x24 32x32 48x48 256x256
 
 install-ext-icons:
 	for context in apps mimetypes; do \
-		$(MKDIR_P) $(themedir)/$$size/$$context ; \
 		for size in $(sizes); do \
+		$(MKDIR_P) $(themedir)/$$size/$$context ; \
 			if (cd $(top_srcdir)/src/ui/gui/icons/$$context/$$size && \
 				(test ! "`printf '%s %s %s' . .. *`" = '. .. *' || test -f '*')) 2> /dev/null ; then \
 				$(INSTALL_DATA) $(top_srcdir)/src/ui/gui/icons/$$context/$$size/* $(themedir)/$$size/$$context ; \