diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6846bd17..72e5d2b4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,12 +27,11 @@ IF( GLIBMM_FOUND AND GTKMM_FOUND AND GLADEMM_FOUND AND PORTAUDIO_FOUND AND XV_FO
ENDIF( GLIBMM_FOUND AND GTKMM_FOUND AND GLADEMM_FOUND AND PORTAUDIO_FOUND AND XV_FOUND )
IF( NOT DATA_INSTALL_DIR )
- SET( DATA_INSTALL_DIR "src/gtk" )
- SET( PKGDATADIR ${DATA_INSTALL_DIR} )
-ELSE( NOT DATA_INSTALL_DIR )
- SET( PKGDATADIR ${CMAKE_INSTALL_PREFIX}/${DATA_INSTALL_DIR} )
+ SET( DATA_INSTALL_DIR "share/vbam" )
ENDIF( NOT DATA_INSTALL_DIR )
+SET( PKGDATADIR ${CMAKE_INSTALL_PREFIX}/${DATA_INSTALL_DIR} )
+
IF( NOT SYSCONFDIR )
SET( SYSCONFDIR "/etc" )
ENDIF( NOT SYSCONFDIR )
@@ -218,6 +217,7 @@ IF( CAN_BUILD_GVBAM )
INSTALL(PROGRAMS gvbam DESTINATION bin)
INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/gtk/vba.glade DESTINATION ${DATA_INSTALL_DIR})
- INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/gtk/icons/gbadvance.svg DESTINATION ${DATA_INSTALL_DIR}/icons)
+ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/gtk/gvbam.desktop DESTINATION share/applications)
+ INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/src/gtk/icons/ DESTINATION share/icons/hicolor PATTERN ".svn" EXCLUDE)
ENDIF( CAN_BUILD_GVBAM )
diff --git a/debian/rules b/debian/rules
index c7ce01e6..6a939340 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,7 +25,7 @@ build: build-stamp
build-stamp:
dh_testdir
- cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr -DDATA_INSTALL_DIR:PATH=share/VisualBoyAdvanceM .
+ cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr .
$(MAKE)
#docbook-to-man debian/vbam.sgml > vbam.1
@@ -50,8 +50,6 @@ install: build
# Add here commands to install the package into debian/vbam.
$(MAKE) DESTDIR=$(CURDIR)/debian/vbam install
- install -c -m 644 -D debian/gvbam.desktop debian/vbam/usr/share/applications/gvbam.desktop
- install -c -m 644 -D src/gtk/icons/gbadvance.svg debian/vbam/usr/share/pixmaps/vbam-icon.svg
# Build architecture-independent files here.
binary-indep: build install
diff --git a/debian/gvbam.desktop b/src/gtk/gvbam.desktop
similarity index 91%
rename from debian/gvbam.desktop
rename to src/gtk/gvbam.desktop
index 4caea54a..8a471a11 100644
--- a/debian/gvbam.desktop
+++ b/src/gtk/gvbam.desktop
@@ -6,5 +6,5 @@ Name=VBA-M
GenericName=GameBoy Advance Emulator
Comment=Nindendo GameBoy Advance Emulator
Exec=gvbam
-Icon=vbam-icon.svg
+Icon=vbam
Categories=Application;Game;Emulator;GTK
diff --git a/src/gtk/icons/16x16/apps/vbam.png b/src/gtk/icons/16x16/apps/vbam.png
new file mode 100644
index 00000000..1390add4
Binary files /dev/null and b/src/gtk/icons/16x16/apps/vbam.png differ
diff --git a/src/gtk/icons/22x22/apps/vbam.png b/src/gtk/icons/22x22/apps/vbam.png
new file mode 100644
index 00000000..10c5cba0
Binary files /dev/null and b/src/gtk/icons/22x22/apps/vbam.png differ
diff --git a/src/gtk/icons/24x24/apps/vbam.png b/src/gtk/icons/24x24/apps/vbam.png
new file mode 100644
index 00000000..b19688ff
Binary files /dev/null and b/src/gtk/icons/24x24/apps/vbam.png differ
diff --git a/src/gtk/icons/32x32/apps/vbam.png b/src/gtk/icons/32x32/apps/vbam.png
new file mode 100644
index 00000000..63952932
Binary files /dev/null and b/src/gtk/icons/32x32/apps/vbam.png differ
diff --git a/src/gtk/icons/gbadvance.svg b/src/gtk/icons/scalable/apps/vbam.svg
similarity index 67%
rename from src/gtk/icons/gbadvance.svg
rename to src/gtk/icons/scalable/apps/vbam.svg
index 764018e7..4201ae94 100644
--- a/src/gtk/icons/gbadvance.svg
+++ b/src/gtk/icons/scalable/apps/vbam.svg
@@ -1,9 +1,8 @@
diff --git a/src/gtk/main.cpp b/src/gtk/main.cpp
index 7a655006..22e4531a 100644
--- a/src/gtk/main.cpp
+++ b/src/gtk/main.cpp
@@ -87,7 +87,7 @@ int main(int argc, char * argv[])
exit(0);
}
- Gtk::Window::set_default_icon_from_file(PKGDATADIR "/icons/gbadvance.svg");
+ Gtk::Window::set_default_icon_name("vbam");
Glib::RefPtr poXml;
try
diff --git a/src/gtk/windowcallbacks.cpp b/src/gtk/windowcallbacks.cpp
index 4b7aae67..995e1f49 100644
--- a/src/gtk/windowcallbacks.cpp
+++ b/src/gtk/windowcallbacks.cpp
@@ -1251,6 +1251,7 @@ void Window::vOnHelpAbout()
oAboutDialog.set_version(VERSION);
oAboutDialog.set_comments(_("Nintendo GameBoy Advance emulator."));
oAboutDialog.set_license("GPL");
+ oAboutDialog.set_logo_icon_name("vbam");
oAboutDialog.set_website("http://vba-m.ngemu.com/");