Merge remote-tracking branch 'origin/5.5' 26/14626/1 scatter
Vincent COUVERT [Thu, 5 Jun 2014 13:55:30 +0000 (15:55 +0200)]
Change-Id: I07557f640b7f0f60d6553e69bd745ed54200f3e8

1  2 
scilab/configure
scilab/configure.ac
scilab/modules/javasci/Makefile.in

Simple merge
Simple merge
@@@ -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 \