diff options
| author | Thomas White <taw@bitwiz.org.uk> | 2009-08-20 19:19:00 +0100 |
|---|---|---|
| committer | Thomas White <taw@bitwiz.org.uk> | 2009-08-20 19:19:00 +0100 |
| commit | 39648419825cddfea1cb1321e552a12b71fede14 (patch) | |
| tree | 13e92f15fe245be6d63ef0413cb49b639b6c9063 | |
| parent | c324c1f0bc2974d154a2dd2ff1472d652f3f45c2 (diff) | |
Fix location of pixmaps so it can potentially be themed
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | data/Makefile.am | 4 | ||||
| -rw-r--r-- | data/openmoocow.desktop | 2 | ||||
| -rw-r--r-- | data/openmoocow.png (renamed from data/icon.png) | bin | 14334 -> 14334 bytes | |||
| -rw-r--r-- | src/Makefile.am | 3 |
5 files changed, 5 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index dc7e82f..95c53d4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ EXTRA_DIST = configure src/mainwindow.h src/types.h src/accelerometers.h src/audio.h \ - data/moo.wav openmoocow.control data/cow.png data/icon.png data/openmoocow.desktop + data/moo.wav openmoocow.control data/cow.png data/openmoocow.png data/openmoocow.desktop SUBDIRS = src data diff --git a/data/Makefile.am b/data/Makefile.am index 3f0f370..eb44693 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -4,5 +4,5 @@ openmoocow_DATA = moo.wav desktopdir = $(datadir)/applications dist_desktop_DATA = openmoocow.desktop -pixmapsdir = $(prefix)/share/pixmaps/openmoocow -pixmaps_DATA = icon.png cow.png +pixmapsdir = $(prefix)/share/pixmaps +pixmaps_DATA = openmoocow.png cow.png diff --git a/data/openmoocow.desktop b/data/openmoocow.desktop index 2a1a089..96351a5 100644 --- a/data/openmoocow.desktop +++ b/data/openmoocow.desktop @@ -5,5 +5,5 @@ Type=Application Exec=openmoocow Terminal=false Categories=Application;Games;Game;GTK; -Icon=openmoocow/icon.png +Icon=openmoocow.png X-MB-SingleInstance=true diff --git a/data/icon.png b/data/openmoocow.png Binary files differindex 1586a53..1586a53 100644 --- a/data/icon.png +++ b/data/openmoocow.png diff --git a/src/Makefile.am b/src/Makefile.am index ee5ae90..284d5ec 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -7,5 +7,4 @@ openmoocow_LDADD = @LIBS@ #moosynth_LDADD = @LIBS@ -lfftw3 AM_CFLAGS = -Wall -g @CFLAGS@ -AM_CPPFLAGS = -DDATADIR=\""$(datadir)"\" -DPIXMAPDIR=\""$(prefix)/share/pixmaps/openmoocow"\" - +AM_CPPFLAGS = -DDATADIR=\""$(datadir)"\" -DPIXMAPDIR=\""$(prefix)/share/pixmaps"\" |
