Mercurial > octave-nkf
changeset 19791:3266c382b328
build: Fix installation of icons for out-of-tree builds
* etc/icons/Makefile.am (install-data-local): Install built icons from
either the build or source directory.
| author | Mike Miller <mtmiller@ieee.org> |
|---|---|
| date | Thu, 19 Feb 2015 00:46:19 -0500 |
| parents | cdcdb255c46d |
| children | a5206dfbaa13 |
| files | etc/icons/Makefile.am |
| diffstat | 1 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/etc/icons/Makefile.am Wed Feb 18 22:35:04 2015 -0500 +++ b/etc/icons/Makefile.am Thu Feb 19 00:46:19 2015 -0500 @@ -71,8 +71,9 @@ fi for f in $(BUILT_PNG_ICONS); do \ size=`echo $$f | $(SED) -n -e "s/.*-\([0-9]\+\)\.png/\1/p"`; \ + if test -f $$f; then d=; else d="$(srcdir)/"; fi; \ $(MKDIR_P) $(DESTDIR)$(datadir)/icons/hicolor/$${size}x$${size}/apps; \ - $(INSTALL_DATA) $$f $(DESTDIR)$(datadir)/icons/hicolor/$${size}x$${size}/apps/octave.png; \ + $(INSTALL_DATA) "$$d$$f" $(DESTDIR)$(datadir)/icons/hicolor/$${size}x$${size}/apps/octave.png; \ done $(MKDIR_P) $(DESTDIR)$(datadir)/icons/hicolor/scalable/apps $(INSTALL_DATA) $(srcdir)/octave-logo.svg $(DESTDIR)$(datadir)/icons/hicolor/scalable/apps/octave.svg