(Linux) Install the desktop entry for everyone in the top-level Makefile

I've also removed the PNG from installation because the icon
specification will cause it to be prefered over the SVG version when
picking the icon.  I have edited the desktop entry to refer to the
icon by basename only, this will allow it to be properly selected
regardless of whether retroarch is installed in /usr or /usr/local

The desktop entry has also been cleaned up to the proper desktop entry
specifications.
This commit is contained in:
Mike Swanson 2015-06-11 10:42:35 -07:00
parent 437c9bb593
commit ac12d52f32
4 changed files with 13 additions and 15 deletions

View file

@ -153,16 +153,17 @@ install: $(TARGET)
rm -f $(OBJDIR)/git_version.o
mkdir -p $(DESTDIR)$(PREFIX)/bin 2>/dev/null || /bin/true
mkdir -p $(DESTDIR)$(GLOBAL_CONFIG_DIR) 2>/dev/null || /bin/true
mkdir -p $(DESTDIR)$(PREFIX)/share/applications 2>/dev/null || /bin/true
mkdir -p $(DESTDIR)$(PREFIX)/share/man/man1 2>/dev/null || /bin/true
mkdir -p $(DESTDIR)$(PREFIX)/share/pixmaps 2>/dev/null || /bin/true
install -m755 $(TARGET) $(DESTDIR)$(PREFIX)/bin
install -m755 tools/cg2glsl.py $(DESTDIR)$(PREFIX)/bin/retroarch-cg2glsl
install -m755 $(JTARGET) $(DESTDIR)$(PREFIX)/bin
install -m644 retroarch.cfg $(DESTDIR)$(GLOBAL_CONFIG_DIR)/retroarch.cfg
install -m644 retroarch.desktop $(DESTDIR)$(PREFIX)/share/applications
install -m644 docs/retroarch.1 $(DESTDIR)$(MAN_DIR)
install -m644 docs/retroarch-cg2glsl.1 $(DESTDIR)$(MAN_DIR)
install -m644 docs/retroarch-joyconfig.1 $(DESTDIR)$(MAN_DIR)
install -m644 media/retroarch.png $(DESTDIR)$(PREFIX)/share/pixmaps
install -m644 media/retroarch.svg $(DESTDIR)$(PREFIX)/share/pixmaps
uninstall:
@ -170,10 +171,10 @@ uninstall:
rm -f $(DESTDIR)$(PREFIX)/bin/retroarch-joyconfig
rm -f $(DESTDIR)$(PREFIX)/bin/retroarch-cg2glsl
rm -f $(DESTDIR)$(GLOBAL_CONFIG_DIR)/retroarch.cfg
rm -f $(DESTDIR)$(PREFIX)/share/applications/retroarch.desktop
rm -f $(DESTDIR)$(PREFIX)/share/man/man1/retroarch.1
rm -f $(DESTDIR)$(PREFIX)/share/man/man1/retroarch-cg2glsl.1
rm -f $(DESTDIR)$(PREFIX)/share/man/man1/retroarch-joyconfig.1
rm -f $(DESTDIR)$(PREFIX)/share/pixmaps/retroarch.png
rm -f $(DESTDIR)$(PREFIX)/share/pixmaps/retroarch.svg
clean:

View file

@ -1,12 +0,0 @@
[Desktop Entry]
Version=1.0
Encoding=UTF-8
Name=RetroArch
Type=Application
GenericName=RetroArch
Comment=RetroArch Multi-Engine Platform
Icon=/usr/share/pixmaps/retroarch.svg
Exec=retroarch
Terminal=false
StartupNotify=false
Categories=Game

View file

@ -46,7 +46,6 @@ override_dh_auto_build:
override_dh_auto_install:
# Add here commands to install the package into debian/retroarch.
$(MAKE) DESTDIR=$(CURDIR)/debian/retroarch PREFIX=/usr install
cp $(CURDIR)/debian/retroarch.desktop $(CURDIR)/debian/retroarch/usr/share/applications/
cp $(CURDIR)/retroarch.cfg $(CURDIR)/debian/retroarch/etc/
ifeq ($(ARCH),armhf)
rm -f $(CURDIR)/debian/retroarch/usr/bin/retroarch-cg2glsl

10
retroarch.desktop Normal file
View file

@ -0,0 +1,10 @@
[Desktop Entry]
Version=1.0
Name=RetroArch
Type=Application
Comment=Multi-Engine Platform
Icon=retroarch
Exec=retroarch
Terminal=false
StartupNotify=false
Categories=Game;Emulator;