From: Vincent COUVERT <vincent.couvert@scilab-enterprises.com>
Date: Thu, 5 Jun 2014 13:55:30 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/5.5'
X-Git-Tag: 6.0.0-alpha-2~415
X-Git-Url: http://gitweb.scilab.org/?p=scilab.git;a=commitdiff_plain;h=refs%2Fheads%2Fscatter

Merge remote-tracking branch 'origin/5.5'

Change-Id: I07557f640b7f0f60d6553e69bd745ed54200f3e8
---

d1cc18c8d236206dd0678d55e5713c7499c80097
diff --cc scilab/modules/javasci/Makefile.in
index be8b26b,245b3fc..22497e3
--- a/scilab/modules/javasci/Makefile.in
+++ b/scilab/modules/javasci/Makefile.in
@@@ -976,10 -976,10 +976,10 @@@ maintainer-clean-generic
  	@echo "This command is intended for maintainers to use"
  	@echo "it deletes files that may require special tools to rebuild."
  	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 -@JAVASCI_FALSE@distclean-local:
  @JAVASCI_FALSE@install-html-local:
 -@JAVASCI_FALSE@clean-local:
+ @JAVASCI_FALSE@install-data-local:
 +@JAVASCI_FALSE@clean-local:
 +@JAVASCI_FALSE@distclean-local:
- @JAVASCI_FALSE@install-data-local:
  clean: clean-am
  
  clean-am: clean-generic clean-libtool clean-local \