Skip to content

Commit 0cf1bcb

Browse files
committed
fix installing icons to staging dir, supposed fix for #2127, patch by Uffe Jakobsen
git-svn-id: https://svn.code.sf.net/p/vice-emu/code/trunk@45858 379a1393-f5fb-40a0-bcee-ef074d9b53f7
1 parent 9a8bbb1 commit 0cf1bcb

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

vice/data/common/Makefile.am

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,7 @@ if INSTALL_DESKTOP_FILES
261261
# Install icon files in their proper place. The default context is 'apps' and
262262
# the default mode is 'system' when running as root and 'user' when not running
263263
# as root, both defaults are what we want.
264+
$(if $(DESTDIR),install-icons: XDG_DATA_HOME=$(DESTDIR)$(prefix)/share)
264265
install-icons:
265266
xdg-icon-resource install --size 32 $(top_srcdir)/data/common/vice-x64_32.png vice-x64
266267
xdg-icon-resource install --size 48 $(top_srcdir)/data/common/vice-x64_48.png vice-x64
@@ -299,6 +300,7 @@ install-icons:
299300
xdg-icon-resource install --size 64 $(top_srcdir)/data/common/vice-vsid_64.png vice-vsid
300301
xdg-icon-resource install --size 256 $(top_srcdir)/data/common/vice-vsid_256.png vice-vsid
301302

303+
$(if $(DESTDIR),uninstall-icons: XDG_DATA_HOME=$(DESTDIR)$(prefix)/share)
302304
uninstall-icons:
303305
xdg-icon-resource uninstall --size 32 vice-x64
304306
xdg-icon-resource uninstall --size 48 vice-x64

0 commit comments

Comments
 (0)