# HG changeset patch # User Rik # Date 1405306017 25200 # Node ID ab7d81d5fbdf4fe898d94090b52943c4dac43cc8 # Parent b316363e3ce56107de62f0d3d478d1e3716c0cbf build: Create octave.desktop even when --disable-docs configured (bug #42720). * etc/icons/Makefile.am, etc/icons/octave-logo.ico, etc/icons/octave-logo.png, etc/icons/octave-logo.svg, etc/icons/octave-sombrero.png, etc/icons/octave.desktop.in, etc/icons/octave_branding_samples.svg: Move doc/icons files to /etc/icons directory. * Makefile.am: Add etc/icons to list of SUBDIRS to build. * configure.ac: Change doc/icons to etc/icons. * doc/Makefile.am: Remove icons from list of SUBDIRS to build. diff -r b316363e3ce5 -r ab7d81d5fbdf Makefile.am --- a/Makefile.am Sun Jul 13 18:37:21 2014 -0700 +++ b/Makefile.am Sun Jul 13 19:46:57 2014 -0700 @@ -82,7 +82,7 @@ if AMCOND_BUILD_GUI SUBDIRS += libgui endif -SUBDIRS += src scripts . @DOCDIR@ examples test . +SUBDIRS += src scripts . @DOCDIR@ examples etc/icons test . if ! AMCOND_BUILD_DOCS dist-hook: diff -r b316363e3ce5 -r ab7d81d5fbdf configure.ac --- a/configure.ac Sun Jul 13 18:37:21 2014 -0700 +++ b/configure.ac Sun Jul 13 19:46:57 2014 -0700 @@ -2875,10 +2875,10 @@ doc/Makefile doc/doxyhtml/Makefile doc/doxyhtml/Doxyfile - doc/icons/Makefile doc/interpreter/Makefile doc/liboctave/Makefile doc/refcard/Makefile + etc/icons/Makefile examples/Makefile libgnu/Makefile libgui/Makefile diff -r b316363e3ce5 -r ab7d81d5fbdf doc/Makefile.am --- a/doc/Makefile.am Sun Jul 13 18:37:21 2014 -0700 +++ b/doc/Makefile.am Sun Jul 13 19:46:57 2014 -0700 @@ -29,5 +29,5 @@ texinfo.tex \ texmf.cnf -SUBDIRS = doxyhtml icons interpreter liboctave refcard +SUBDIRS = doxyhtml interpreter liboctave refcard diff -r b316363e3ce5 -r ab7d81d5fbdf doc/icons/Makefile.am --- a/doc/icons/Makefile.am Sun Jul 13 18:37:21 2014 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,56 +0,0 @@ -# Makefile for Octave's doc/icons directory -# -# Copyright (C) 2012-2013 John W. Eaton -# -# This file is part of Octave. -# -# Octave is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation; either version 3 of the License, or (at -# your option) any later version. -# -# Octave is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# for more details. -# -# You should have received a copy of the GNU General Public License -# along with Octave; see the file COPYING. If not, see -# . - -include $(top_srcdir)/build-aux/common.mk - -IMAGE_FILES = \ - octave-logo.ico \ - octave-logo.png \ - octave-logo.svg \ - octave-sombrero.png - -image_DATA = $(IMAGE_FILES) - -all-local: octave.desktop - -octave.desktop: octave.desktop.in Makefile - @echo "making $@ from $<" - $(SED) < $< > $@-t \ - -e "s|%OCTAVE_IMAGEDIR%|${imagedir}|" \ - -e "s|%OCTAVE_PREFIX%|${prefix}|" - mv $@-t $@ - -install-data-local: - -if test -n "$(DESKTOP_FILE_INSTALL)"; then \ - $(DESKTOP_FILE_INSTALL) --dir=$(DESTDIR)$(datadir)/applications \ - --vendor www.octave.org octave.desktop; \ - fi - -uninstall-local: - if test -n "$(DESKTOP_FILE_INSTALL)"; then \ - rm -f $(DESTDIR)$(datadir)/applications/www.octave.org-octave.desktop; \ - fi - -EXTRA_DIST = \ - $(IMAGE_FILES) \ - octave.desktop.in - -CLEANFILES = octave.desktop - diff -r b316363e3ce5 -r ab7d81d5fbdf doc/icons/octave-logo.ico Binary file doc/icons/octave-logo.ico has changed diff -r b316363e3ce5 -r ab7d81d5fbdf doc/icons/octave-logo.png Binary file doc/icons/octave-logo.png has changed diff -r b316363e3ce5 -r ab7d81d5fbdf doc/icons/octave-logo.svg --- a/doc/icons/octave-logo.svg Sun Jul 13 18:37:21 2014 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,113 +0,0 @@ - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - diff -r b316363e3ce5 -r ab7d81d5fbdf doc/icons/octave-sombrero.png Binary file doc/icons/octave-sombrero.png has changed diff -r b316363e3ce5 -r ab7d81d5fbdf doc/icons/octave.desktop.in --- a/doc/icons/octave.desktop.in Sun Jul 13 18:37:21 2014 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,10 +0,0 @@ -[Desktop Entry] -Name=GNU Octave -Comment=Scientific Computing using GNU Octave -TryExec=%OCTAVE_PREFIX%/bin/octave -Exec=%OCTAVE_PREFIX%/bin/octave -Icon=%OCTAVE_IMAGEDIR%/octave-logo.svg -Terminal=true -Type=Application -Categories=Education;Science;Math; -StartupNotify=false diff -r b316363e3ce5 -r ab7d81d5fbdf doc/icons/octave_branding_samples.svg --- a/doc/icons/octave_branding_samples.svg Sun Jul 13 18:37:21 2014 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1177 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - 10101000010010010100010001 - OCTAVE - [free your numbers] - - - - - - - - - - - - OCTAVE - - - - - OCTAVE - - - - - - - - - - - OCTAVE - - - - - - - - - - - - - OCTAVE - - - - - - - - - - OCTAVE - - - - - - - - - - - OCTAVE - - - - diff -r b316363e3ce5 -r ab7d81d5fbdf etc/icons/Makefile.am --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/etc/icons/Makefile.am Sun Jul 13 19:46:57 2014 -0700 @@ -0,0 +1,56 @@ +# Makefile for Octave's doc/icons directory +# +# Copyright (C) 2012-2013 John W. Eaton +# +# This file is part of Octave. +# +# Octave is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 3 of the License, or (at +# your option) any later version. +# +# Octave is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# for more details. +# +# You should have received a copy of the GNU General Public License +# along with Octave; see the file COPYING. If not, see +# . + +include $(top_srcdir)/build-aux/common.mk + +IMAGE_FILES = \ + octave-logo.ico \ + octave-logo.png \ + octave-logo.svg \ + octave-sombrero.png + +image_DATA = $(IMAGE_FILES) + +all-local: octave.desktop + +octave.desktop: octave.desktop.in Makefile + @echo "making $@ from $<" + $(SED) < $< > $@-t \ + -e "s|%OCTAVE_IMAGEDIR%|${imagedir}|" \ + -e "s|%OCTAVE_PREFIX%|${prefix}|" + mv $@-t $@ + +install-data-local: + -if test -n "$(DESKTOP_FILE_INSTALL)"; then \ + $(DESKTOP_FILE_INSTALL) --dir=$(DESTDIR)$(datadir)/applications \ + --vendor www.octave.org octave.desktop; \ + fi + +uninstall-local: + if test -n "$(DESKTOP_FILE_INSTALL)"; then \ + rm -f $(DESTDIR)$(datadir)/applications/www.octave.org-octave.desktop; \ + fi + +EXTRA_DIST = \ + $(IMAGE_FILES) \ + octave.desktop.in + +CLEANFILES = octave.desktop + diff -r b316363e3ce5 -r ab7d81d5fbdf etc/icons/octave-logo.ico Binary file etc/icons/octave-logo.ico has changed diff -r b316363e3ce5 -r ab7d81d5fbdf etc/icons/octave-logo.png Binary file etc/icons/octave-logo.png has changed diff -r b316363e3ce5 -r ab7d81d5fbdf etc/icons/octave-logo.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/etc/icons/octave-logo.svg Sun Jul 13 19:46:57 2014 -0700 @@ -0,0 +1,113 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + diff -r b316363e3ce5 -r ab7d81d5fbdf etc/icons/octave-sombrero.png Binary file etc/icons/octave-sombrero.png has changed diff -r b316363e3ce5 -r ab7d81d5fbdf etc/icons/octave.desktop.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/etc/icons/octave.desktop.in Sun Jul 13 19:46:57 2014 -0700 @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=GNU Octave +Comment=Scientific Computing using GNU Octave +TryExec=%OCTAVE_PREFIX%/bin/octave +Exec=%OCTAVE_PREFIX%/bin/octave +Icon=%OCTAVE_IMAGEDIR%/octave-logo.svg +Terminal=true +Type=Application +Categories=Education;Science;Math; +StartupNotify=false diff -r b316363e3ce5 -r ab7d81d5fbdf etc/icons/octave_branding_samples.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/etc/icons/octave_branding_samples.svg Sun Jul 13 19:46:57 2014 -0700 @@ -0,0 +1,1177 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + 10101000010010010100010001 + OCTAVE + [free your numbers] + + + + + + + + + + + + OCTAVE + + + + + OCTAVE + + + + + + + + + + + OCTAVE + + + + + + + + + + + + + OCTAVE + + + + + + + + + + OCTAVE + + + + + + + + + + + OCTAVE + + + +