Merge pull request #368 from orbea/data

gtk: Use datarootdir instead of datadir.
This commit is contained in:
bearoso 2018-07-30 15:36:25 -05:00 committed by GitHub
commit 297f0adadf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 22 deletions

View File

@ -1,42 +1,41 @@
desktopdir = $(datadir)/applications desktopdir = $(datarootdir)/applications
desktop_DATA = snes9x.desktop desktop_DATA = snes9x.desktop
icon16x16dir = $(datadir)/icons/hicolor/16x16/apps icon16x16dir = $(datarootdir)/icons/hicolor/16x16/apps
icon16x16_DATA = snes9x_16x16.png icon16x16_DATA = snes9x_16x16.png
icon24x24dir = $(datadir)/icons/hicolor/24x24/apps icon24x24dir = $(datarootdir)/icons/hicolor/24x24/apps
icon24x24_DATA = snes9x_24x24.png icon24x24_DATA = snes9x_24x24.png
icon32x32dir = $(datadir)/icons/hicolor/32x32/apps icon32x32dir = $(datarootdir)/icons/hicolor/32x32/apps
icon32x32_DATA = snes9x_32x32.png icon32x32_DATA = snes9x_32x32.png
icon64x64dir = $(datadir)/icons/hicolor/64x64/apps icon64x64dir = $(datarootdir)/icons/hicolor/64x64/apps
icon64x64_DATA = snes9x_64x64.png icon64x64_DATA = snes9x_64x64.png
icon128x128dir = $(datadir)/icons/hicolor/128x128/apps icon128x128dir = $(datarootdir)/icons/hicolor/128x128/apps
icon128x128_DATA = snes9x_128x128.png icon128x128_DATA = snes9x_128x128.png
icon256x256dir = $(datadir)/icons/hicolor/256x256/apps icon256x256dir = $(datarootdir)/icons/hicolor/256x256/apps
icon256x256_DATA = snes9x_256x256.png icon256x256_DATA = snes9x_256x256.png
#iconscalabledir = $(datadir)/icons/hicolor/scalable/apps #iconscalabledir = $(datarootdir)/icons/hicolor/scalable/apps
#iconscalable_DATA = snes9x.svg #iconscalable_DATA = snes9x.svg
cheatsdir = $(datadir)/snes9x cheatsdir = $(datadir)/snes9x
cheats_DATA = ../../data/cheats.bml cheats_DATA = ../../data/cheats.bml
install-data-hook: install-data-hook:
mv -f $(DESTDIR)$(datadir)/icons/hicolor/16x16/apps/snes9x_16x16.png \ mv -f $(DESTDIR)$(datarootdir)/icons/hicolor/16x16/apps/snes9x_16x16.png \
$(DESTDIR)$(datadir)/icons/hicolor/16x16/apps/snes9x.png $(DESTDIR)$(datarootdir)/icons/hicolor/16x16/apps/snes9x.png
mv -f $(DESTDIR)$(datadir)/icons/hicolor/24x24/apps/snes9x_24x24.png \ mv -f $(DESTDIR)$(datarootdir)/icons/hicolor/24x24/apps/snes9x_24x24.png \
$(DESTDIR)$(datadir)/icons/hicolor/24x24/apps/snes9x.png $(DESTDIR)$(datarootdir)/icons/hicolor/24x24/apps/snes9x.png
mv -f $(DESTDIR)$(datadir)/icons/hicolor/32x32/apps/snes9x_32x32.png \ mv -f $(DESTDIR)$(datarootdir)/icons/hicolor/32x32/apps/snes9x_32x32.png \
$(DESTDIR)$(datadir)/icons/hicolor/32x32/apps/snes9x.png $(DESTDIR)$(datarootdir)/icons/hicolor/32x32/apps/snes9x.png
mv -f $(DESTDIR)$(datadir)/icons/hicolor/64x64/apps/snes9x_64x64.png \ mv -f $(DESTDIR)$(datarootdir)/icons/hicolor/64x64/apps/snes9x_64x64.png \
$(DESTDIR)$(datadir)/icons/hicolor/64x64/apps/snes9x.png $(DESTDIR)$(datarootdir)/icons/hicolor/64x64/apps/snes9x.png
mv -f $(DESTDIR)$(datadir)/icons/hicolor/128x128/apps/snes9x_128x128.png \ mv -f $(DESTDIR)$(datarootdir)/icons/hicolor/128x128/apps/snes9x_128x128.png \
$(DESTDIR)$(datadir)/icons/hicolor/128x128/apps/snes9x.png $(DESTDIR)$(datarootdir)/icons/hicolor/128x128/apps/snes9x.png
mv -f $(DESTDIR)$(datadir)/icons/hicolor/256x256/apps/snes9x_256x256.png \ mv -f $(DESTDIR)$(datarootdir)/icons/hicolor/256x256/apps/snes9x_256x256.png \
$(DESTDIR)$(datadir)/icons/hicolor/256x256/apps/snes9x.png $(DESTDIR)$(datarootdir)/icons/hicolor/256x256/apps/snes9x.png
touch -c $(DESTDIR)$(datadir)/icons/hicolor touch -c $(DESTDIR)$(datarootdir)/icons/hicolor