changeset 16065:6a44bb3c9593 stable

maint: merge away extra head on stable
author John W. Eaton <jwe@octave.org>
date Sat, 16 Feb 2013 18:51:29 -0500
parents c5b4b9507a55 (diff) f47b8b3e2442 (current diff)
children 0df6c1c73e21 16345c7b4ed1
files
diffstat 1 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/Makefile.am	Mon Feb 11 16:23:14 2013 -0500
+++ b/scripts/Makefile.am	Sat Feb 16 18:51:29 2013 -0500
@@ -74,7 +74,11 @@
 
 FCN_FILES_IN = $(GEN_FCN_FILES:.m=.in)
 
+if AMCOND_BUILD_DOCS
 all-local: $(GEN_FCN_FILES) $(PKG_ADD_FILES) .DOCSTRINGS
+else
+all-local: $(GEN_FCN_FILES) $(PKG_ADD_FILES)
+endif
 
 octave_dirstamp = $(am__leading_dot)dirstamp