m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch by sm4tik (arch linux packager): allow putting the icons in pixmap/ instead of icons/. Thanks!

Browse Source 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1684 416bcca6-2ee7-4201-b75f-2eb2f807beb1
This commit is contained in:
Adrien Destugues 2011-01-17 19:29:57 +00:00
parent 54353c6094
commit 83ecd4a6e8
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Makefile
View File

@ -25,6 +25,7 @@
bindir = $(exec_prefix)/bin bindir = $(exec_prefix)/bin
datarootdir = $(prefix)/share datarootdir = $(prefix)/share
datadir = $(datarootdir) datadir = $(datarootdir)
pixmapdir = $(datarootdir)/icons
# Compile with OPTIM=0 to disable gcc optimizations, to enable debug. # Compile with OPTIM=0 to disable gcc optimizations, to enable debug.
STRIP = strip 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 || $(MKDIR) $(DESTDIR)$(datadir)/grafx2/scripts
test -d $(DESTDIR)$(datadir)/grafx2/scripts/libs || $(MKDIR) $(DESTDIR)$(datadir)/grafx2/scripts/libs 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)/applications || $(MKDIR) $(DESTDIR)$(datadir)/applications
test -d $(DESTDIR)$(datadir)/icons || $(MKDIR) $(DESTDIR)$(datadir)/icons test -d $(DESTDIR)$(pixmapdir) || $(MKDIR) $(DESTDIR)$(pixmapdir)
# Copy files # Copy files
$(CP) $(BIN) $(DESTDIR)$(bindir) $(CP) $(BIN) $(DESTDIR)$(bindir)
$(CP) ../share/grafx2/gfx2def.ini $(DESTDIR)$(datadir)/grafx2/ $(CP) ../share/grafx2/gfx2def.ini $(DESTDIR)$(datadir)/grafx2/
@ -445,8 +446,8 @@ install : $(BIN)
$(CP) $(SCRIPTLIB_FILES) $(DESTDIR)$(datadir)/grafx2/scripts/libs/ $(CP) $(SCRIPTLIB_FILES) $(DESTDIR)$(datadir)/grafx2/scripts/libs/
# Icon and desktop file for debian # Icon and desktop file for debian
$(CP) ../misc/unix/grafx2.desktop $(DESTDIR)$(datadir)/applications/ $(CP) ../misc/unix/grafx2.desktop $(DESTDIR)$(datadir)/applications/
$(CP) ../misc/unix/grafx2.xpm $(DESTDIR)$(datadir)/icons/ $(CP) ../misc/unix/grafx2.xpm $(DESTDIR)$(pixmapdir)
$(CP) ../share/icons/grafx2.svg $(DESTDIR)$(datadir)/icons/ $(CP) ../share/icons/grafx2.svg $(DESTDIR)$(pixmapdir)
@echo Install complete @echo Install complete
# Linux uninstallation of the program # Linux uninstallation of the program
@ -465,8 +466,8 @@ uninstall :
$(if $(wildcard $(DESTDIR)$(datadir)/grafx2),,$(RMDIR) $(DESTDIR)$(datadir)/grafx2) $(if $(wildcard $(DESTDIR)$(datadir)/grafx2),,$(RMDIR) $(DESTDIR)$(datadir)/grafx2)
# Icon and desktop file for debian # Icon and desktop file for debian
$(DELCOMMAND) $(DESTDIR)$(datadir)/applications/grafx2.desktop $(DELCOMMAND) $(DESTDIR)$(datadir)/applications/grafx2.desktop
$(DELCOMMAND) $(DESTDIR)$(datadir)/icons/grafx2.xpm $(DELCOMMAND) $(DESTDIR)$(pixmapdir)/grafx2.xpm
$(DELCOMMAND) $(DESTDIR)$(datadir)/icons/grafx2.svg $(DELCOMMAND) $(DESTDIR)$(pixmapdir)/grafx2.svg
@echo Uninstall complete @echo Uninstall complete
endif endif

8
src/helpfile.h
View File

@ -455,10 +455,10 @@ static const T_Help_table helptable_credits[] =
HELP_TEXT (" Lorenzo Gatti MagerValp maymunbeyin ") HELP_TEXT (" Lorenzo Gatti MagerValp maymunbeyin ")
HELP_TEXT (" mind MooZ Pasi Kallinen ") HELP_TEXT (" mind MooZ Pasi Kallinen ")
HELP_TEXT (" the Peach petter PheeL ") HELP_TEXT (" the Peach petter PheeL ")
HELP_TEXT (" richienyhus spratek tape.yrm ") HELP_TEXT (" richienyhus sm4tik spratek ")
HELP_TEXT (" TeeEmCee tempest Timo Kurrpa ") HELP_TEXT (" tape.yrm TeeEmCee tempest ")
HELP_TEXT (" titus^Rab Tobé yakumo9275 ") HELP_TEXT (" Timo Kurrpa titus^Rab Tobé ")
HELP_TEXT (" 00ai99") HELP_TEXT (" yakumo2975 00ai99")
HELP_TEXT ("") HELP_TEXT ("")
HELP_TEXT (" ... posted the annoying bug reports.") HELP_TEXT (" ... posted the annoying bug reports.")
HELP_TEXT ("") HELP_TEXT ("")