Mirrors
/
gparted
mirror of https://gitlab.gnome.org/GNOME/gparted.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Only install fallback icon when required (#695279) 

Applications are moving away from storing icons in /usr/share/pixmaps,
instead preferring /usr/share/icons/hicolor/$SIZE/apps, so only install
the fallback icon when GParted requires it.

Bug #695279 - GParted doesn't compile on RHEL / CentOS 5.9
This commit is contained in:
Mike Fleetwood 2013-04-28 10:36:43 +01:00 committed by Curtis Gedak
parent b09d6035cd
commit d6baac2546
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configure.ac
View File

@ -308,9 +308,12 @@ AC_LINK_IFELSE(
)],
[AC_DEFINE([HAVE_SET_DEFAULT_ICON_NAME], 1,
[Define to 1 if gtkmm-2.4 provides Gtk::Window::set_default_icon_name() method.])
AM_CONDITIONAL([INSTALL_PIXMAPS_DIR], false)
AC_MSG_RESULT([yes])
],
[AC_MSG_RESULT([no])]
[AM_CONDITIONAL([INSTALL_PIXMAPS_DIR], true)
AC_MSG_RESULT([no])
]
)
CXXFLAGS="$CXXFLAGS_save"
AC_LANG_POP([C++])

10
data/icons/Makefile.am
View File

@ -36,6 +36,12 @@ EXTRA_DIST = \
$(noinst_DATA) \
$(NULL)
# Only install fallback icon to /usr/share/pixmaps if required
if INSTALL_PIXMAPS_DIR
INSTALL_PIXMAP = install-pixmap
UNINSTALL_PIXMAP = uninstall-pixmap
endif
###############################################################################
gtk_update_icon_cache = gtk-update-icon-cache -f -t
@ -94,6 +100,6 @@ install-pixmap:
uninstall-pixmap:
rm -f $(DESTDIR)$(datadir)/pixmaps/gparted.png
install-data-local: install-icons install-pixmap update-icon-cache
install-data-local: install-icons $(INSTALL_PIXMAP) update-icon-cache
uninstall-local: uninstall-icons uninstall-pixmap update-icon-cache
uninstall-local: uninstall-icons $(UNINSTALL_PIXMAP) update-icon-cache