Mercurial > octave-libgccjit

changeset 15916:57046e0a9fb5 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* src/Makefile.am: Fix bungled merge.
author John W. Eaton <jwe@octave.org>
date Tue, 08 Jan 2013 17:04:52 -0500
parents 75ee21062d0b
children 4f3a587cf168 59128350e011
files src/Makefile.am
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/Makefile.am	Tue Jan 08 15:59:47 2013 -0500
+++ b/src/Makefile.am	Tue Jan 08 17:04:52 2013 -0500
@@ -668,9 +668,11 @@
 	@$(PERL) $(srcdir)/gendoc.pl $(ALL_DEF_FILES) > $@
 	$(top_srcdir)/build-aux/move-if-change $@ DOCSTRINGS
 	touch $@
-endif
 
 all-local: $(OCT_STAMP_FILES) $(DLD_FUNCTIONS_PKG_ADD_FILE) .DOCSTRINGS
+else
+all-local: $(OCT_STAMP_FILES) $(DLD_FUNCTIONS_PKG_ADD_FILE)
+endif
 
 if AMCOND_BUILD_COMPILED_AUX_PROGRAMS
 octave-config.cc: octave-config.cc.in Makefile