Mercurial > hg > octave-nkf

changeset 19108:62eb2927917e gui-release

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Periodic merge of stable to gui-release.
author Rik <rik@octave.org>
date Sun, 13 Jul 2014 19:59:56 -0700
parents eea4f61960d4 (current diff) bebe22d2cb58 (diff)
children 2c1e8de41649
files configure.ac 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
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
@@ -2877,10 +2877,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
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -29,5 +29,5 @@
   texinfo.tex \
   texmf.cnf
 
-SUBDIRS = doxyhtml icons interpreter liboctave refcard
+SUBDIRS = doxyhtml interpreter liboctave refcard
 
rename from doc/icons/Makefile.am
rename to etc/icons/Makefile.am
rename from doc/icons/octave-logo.ico
rename to etc/icons/octave-logo.ico

rename from doc/icons/octave-logo.png
rename to etc/icons/octave-logo.png

rename from doc/icons/octave-logo.svg
rename to etc/icons/octave-logo.svg
rename from doc/icons/octave-sombrero.png
rename to etc/icons/octave-sombrero.png

rename from doc/icons/octave.desktop.in
rename to etc/icons/octave.desktop.in
rename from doc/icons/octave_branding_samples.svg
rename to etc/icons/octave_branding_samples.svg