Mercurial > hg > octave-nkf
changeset 19103:ab7d81d5fbdf
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.
author | Rik <rik@octave.org> |
---|---|
date | Sun, 13 Jul 2014 19:46:57 -0700 |
parents | b316363e3ce5 |
children | c4def7ab39e7 |
files | Makefile.am configure.ac doc/Makefile.am doc/icons/Makefile.am doc/icons/octave-logo.ico doc/icons/octave-logo.png doc/icons/octave-logo.svg doc/icons/octave-sombrero.png doc/icons/octave.desktop.in doc/icons/octave_branding_samples.svg 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 |
diffstat | 10 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.am +++ b/Makefile.am @@ -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:
--- a/configure.ac +++ b/configure.ac @@ -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