diff Makefile.am @ 18914:bebe22d2cb58 stable

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 3c1a28978599
children c4def7ab39e7 446c46af4b42
line wrap: on
line diff
--- a/Makefile.am	Sun Jul 13 17:43:19 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: