From 83ecd4a6e8df55d0de01119a0284c7cb54141bfe Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@gmail.com>
Date: Mon, 17 Jan 2011 19:29:57 +0000
Subject: [PATCH] Patch by sm4tik (arch linux packager): allow putting the
 icons in pixmap/ instead of icons/. Thanks!

git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1684 416bcca6-2ee7-4201-b75f-2eb2f807beb1
---
 src/Makefile   | 11 ++++++-----
 src/helpfile.h |  8 ++++----
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index 9a0d8df7..6f5f0247 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -25,6 +25,7 @@
   bindir = $(exec_prefix)/bin
   datarootdir = $(prefix)/share
   datadir = $(datarootdir)
+  pixmapdir = $(datarootdir)/icons
 
 # Compile with OPTIM=0 to disable gcc optimizations, to enable debug.
   STRIP = strip
@@ -434,7 +435,7 @@ install : $(BIN)
 	test -d $(DESTDIR)$(datadir)/grafx2/scripts || $(MKDIR) $(DESTDIR)$(datadir)/grafx2/scripts
 	test -d $(DESTDIR)$(datadir)/grafx2/scripts/libs || $(MKDIR) $(DESTDIR)$(datadir)/grafx2/scripts/libs
 	test -d $(DESTDIR)$(datadir)/applications || $(MKDIR) $(DESTDIR)$(datadir)/applications
-	test -d $(DESTDIR)$(datadir)/icons || $(MKDIR) $(DESTDIR)$(datadir)/icons
+	test -d $(DESTDIR)$(pixmapdir) || $(MKDIR) $(DESTDIR)$(pixmapdir)
 	# Copy files
 	$(CP) $(BIN) $(DESTDIR)$(bindir)
 	$(CP) ../share/grafx2/gfx2def.ini $(DESTDIR)$(datadir)/grafx2/
@@ -445,8 +446,8 @@ install : $(BIN)
 	$(CP) $(SCRIPTLIB_FILES) $(DESTDIR)$(datadir)/grafx2/scripts/libs/
 	# Icon and desktop file for debian
 	$(CP) ../misc/unix/grafx2.desktop $(DESTDIR)$(datadir)/applications/
-	$(CP) ../misc/unix/grafx2.xpm $(DESTDIR)$(datadir)/icons/
-	$(CP) ../share/icons/grafx2.svg $(DESTDIR)$(datadir)/icons/
+	$(CP) ../misc/unix/grafx2.xpm $(DESTDIR)$(pixmapdir)
+	$(CP) ../share/icons/grafx2.svg $(DESTDIR)$(pixmapdir)
 	@echo Install complete
   
 # Linux uninstallation of the program
@@ -465,8 +466,8 @@ uninstall :
 	$(if $(wildcard $(DESTDIR)$(datadir)/grafx2),,$(RMDIR) $(DESTDIR)$(datadir)/grafx2)
 	# Icon and desktop file for debian
 	$(DELCOMMAND) $(DESTDIR)$(datadir)/applications/grafx2.desktop
-	$(DELCOMMAND) $(DESTDIR)$(datadir)/icons/grafx2.xpm
-	$(DELCOMMAND) $(DESTDIR)$(datadir)/icons/grafx2.svg
+	$(DELCOMMAND) $(DESTDIR)$(pixmapdir)/grafx2.xpm
+	$(DELCOMMAND) $(DESTDIR)$(pixmapdir)/grafx2.svg
 	@echo Uninstall complete
 
 endif
diff --git a/src/helpfile.h b/src/helpfile.h
index 0c2461ea..11d246a8 100644
--- a/src/helpfile.h
+++ b/src/helpfile.h
@@ -455,10 +455,10 @@ static const T_Help_table helptable_credits[] =
   HELP_TEXT ("  Lorenzo Gatti MagerValp     maymunbeyin   ")
   HELP_TEXT ("  mind          MooZ          Pasi Kallinen ")
   HELP_TEXT ("  the Peach     petter        PheeL         ")
-  HELP_TEXT ("  richienyhus   spratek       tape.yrm      ")
-  HELP_TEXT ("  TeeEmCee      tempest       Timo Kurrpa   ")
-  HELP_TEXT ("  titus^Rab     Tobé          yakumo9275    ")
-  HELP_TEXT ("  00ai99")
+  HELP_TEXT ("  richienyhus   sm4tik        spratek       ")
+  HELP_TEXT ("  tape.yrm      TeeEmCee      tempest       ")
+  HELP_TEXT ("  Timo Kurrpa   titus^Rab     Tobé          ")
+  HELP_TEXT ("  yakumo2975    00ai99")
   HELP_TEXT ("")
   HELP_TEXT ("  ... posted the annoying bug reports.")
   HELP_TEXT ("")