Use /usr/share/pixmaps instead of icons.

This commit is contained in:
Themaister 2013-01-26 17:50:22 +01:00
parent 45839ac82e
commit 1a4b094abf
2 changed files with 4 additions and 4 deletions

View File

@ -366,13 +366,13 @@ install: $(TARGET)
mkdir -p $(DESTDIR)$(PREFIX)/bin 2>/dev/null || /bin/true mkdir -p $(DESTDIR)$(PREFIX)/bin 2>/dev/null || /bin/true
mkdir -p $(DESTDIR)/etc 2>/dev/null || /bin/true mkdir -p $(DESTDIR)/etc 2>/dev/null || /bin/true
mkdir -p $(DESTDIR)$(PREFIX)/share/man/man1 2>/dev/null || /bin/true mkdir -p $(DESTDIR)$(PREFIX)/share/man/man1 2>/dev/null || /bin/true
mkdir -p $(DESTDIR)$(PREFIX)/share/icons 2>/dev/null || /bin/true mkdir -p $(DESTDIR)$(PREFIX)/share/pixmaps 2>/dev/null || /bin/true
install -m755 $(TARGET) $(DESTDIR)$(PREFIX)/bin install -m755 $(TARGET) $(DESTDIR)$(PREFIX)/bin
install -m644 retroarch.cfg $(DESTDIR)/etc/retroarch.cfg install -m644 retroarch.cfg $(DESTDIR)/etc/retroarch.cfg
install -m644 docs/retroarch.1 $(DESTDIR)$(MAN_DIR) install -m644 docs/retroarch.1 $(DESTDIR)$(MAN_DIR)
install -m644 docs/retroarch-joyconfig.1 $(DESTDIR)$(MAN_DIR) install -m644 docs/retroarch-joyconfig.1 $(DESTDIR)$(MAN_DIR)
install -m755 retroarch-zip $(DESTDIR)$(PREFIX)/bin install -m755 retroarch-zip $(DESTDIR)$(PREFIX)/bin
install -m644 media/retroarch.png $(DESTDIR)$(PREFIX)/share/icons install -m644 media/retroarch.png $(DESTDIR)$(PREFIX)/share/pixmaps
uninstall: uninstall:
rm -f $(DESTDIR)$(PREFIX)/bin/retroarch rm -f $(DESTDIR)$(PREFIX)/bin/retroarch
@ -382,7 +382,7 @@ uninstall:
rm -f $(DESTDIR)/etc/retroarch.cfg rm -f $(DESTDIR)/etc/retroarch.cfg
rm -f $(DESTDIR)$(PREFIX)/share/man/man1/retroarch.1 rm -f $(DESTDIR)$(PREFIX)/share/man/man1/retroarch.1
rm -f $(DESTDIR)$(PREFIX)/share/man/man1/retroarch-joyconfig.1 rm -f $(DESTDIR)$(PREFIX)/share/man/man1/retroarch-joyconfig.1
rm -f $(DESTDIR)$(PREFIX)/share/icons/retroarch.png rm -f $(DESTDIR)$(PREFIX)/share/pixmaps/retroarch.png
clean: clean:
rm -f *.o rm -f *.o

View File

@ -110,7 +110,7 @@ static void x11_set_window_icon(Display *dpy, Window win)
{ {
XA_INIT(_NET_WM_ICON); XA_INIT(_NET_WM_ICON);
const char *path = "/usr/share/icons/retroarch.png"; const char *path = "/usr/share/pixmaps/retroarch.png";
struct texture_image img; struct texture_image img;
if (texture_image_load(path, &img)) if (texture_image_load(path, &img))