Fix make install trouble mixing localization and scirenderer 96/15396/2
Bruno JOFRET [Fri, 17 Oct 2014 10:01:43 +0000 (12:01 +0200)]
Change-Id: I5caafb49a374bafd37c6780f261d301adc0d5c26

scilab/Makefile.am
scilab/Makefile.in

index 8c79abe..81fceca 100644 (file)
@@ -477,8 +477,8 @@ JAVASCI_DIRS = . resources \
        org/scilab/modules/javasci/ \
        org/scilab/modules/types/
 
-if GENERATE_LOCALIZATION_FILES
 install-data-local:
+if GENERATE_LOCALIZATION_FILES
        @$(mkinstalldirs) $(DESTDIR)$(localedir); \
        echo $(mkinstalldirs) $(DESTDIR)$(localedir); \
        for lang in $(ALL_LINGUAS); do \
@@ -489,7 +489,6 @@ install-data-local:
                $(INSTALL_DATA) $(top_builddir)/locale/$$lang/LC_MESSAGES/$(LANG_DOMAIN).mo $$LANG_PATH_DIST/; \
        done
 endif
-
 ################ INSTALL DOCUMENTATION #################
 # Starting from Scilab 5, documentation file are provided by Docbook
 # In the Scilab application we are generating a JavaHelp file.
@@ -518,10 +517,12 @@ if BUILD_HELP
        fi
 endif
 if !EXTERNAL_SCIRENDERER
+if GUI
 # Also install scirenderer.jar
        $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/$(PATHTOSCIRENDERER)
        $(INSTALL_DATA) $(top_builddir)/$(PATHTOSCIRENDERER)/$(SCIRENDERERJAR) $(DESTDIR)$(pkgdatadir)/$(PATHTOSCIRENDERER)/
 endif
+endif
 
 # Pkgconfig directory
 pkgconfigdir = $(libdir)/pkgconfig
index 51f373d..5f80c2a 100644 (file)
@@ -1962,7 +1962,6 @@ distclean-generic:
 maintainer-clean-generic:
        @echo "This command is intended for maintainers to use"
        @echo "it deletes files that may require special tools to rebuild."
-@GENERATE_LOCALIZATION_FILES_FALSE@install-data-local:
 clean: clean-recursive
 
 clean-am: clean-binPROGRAMS clean-checkPROGRAMS clean-generic \
@@ -2328,7 +2327,7 @@ codecoverage-java: clean-reports
 @GENERATE_LOCALIZATION_FILES_TRUE@             fi; \
 @GENERATE_LOCALIZATION_FILES_TRUE@     done;
 
-@GENERATE_LOCALIZATION_FILES_TRUE@install-data-local:
+install-data-local:
 @GENERATE_LOCALIZATION_FILES_TRUE@     @$(mkinstalldirs) $(DESTDIR)$(localedir); \
 @GENERATE_LOCALIZATION_FILES_TRUE@     echo $(mkinstalldirs) $(DESTDIR)$(localedir); \
 @GENERATE_LOCALIZATION_FILES_TRUE@     for lang in $(ALL_LINGUAS); do \
@@ -2338,7 +2337,6 @@ codecoverage-java: clean-reports
 @GENERATE_LOCALIZATION_FILES_TRUE@             echo $(INSTALL_DATA) $(top_builddir)/locale/$$lang/LC_MESSAGES/$(LANG_DOMAIN).mo $$LANG_PATH_DIST/; \
 @GENERATE_LOCALIZATION_FILES_TRUE@             $(INSTALL_DATA) $(top_builddir)/locale/$$lang/LC_MESSAGES/$(LANG_DOMAIN).mo $$LANG_PATH_DIST/; \
 @GENERATE_LOCALIZATION_FILES_TRUE@     done
-
 ################ INSTALL DOCUMENTATION #################
 # Starting from Scilab 5, documentation file are provided by Docbook
 # In the Scilab application we are generating a JavaHelp file.
@@ -2363,8 +2361,8 @@ codecoverage-java: clean-reports
 @BUILD_HELP_TRUE@      done; \
 @BUILD_HELP_TRUE@      fi
 # Also install scirenderer.jar
-@EXTERNAL_SCIRENDERER_FALSE@   $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/$(PATHTOSCIRENDERER)
-@EXTERNAL_SCIRENDERER_FALSE@   $(INSTALL_DATA) $(top_builddir)/$(PATHTOSCIRENDERER)/$(SCIRENDERERJAR) $(DESTDIR)$(pkgdatadir)/$(PATHTOSCIRENDERER)/
+@EXTERNAL_SCIRENDERER_FALSE@@GUI_TRUE@ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/$(PATHTOSCIRENDERER)
+@EXTERNAL_SCIRENDERER_FALSE@@GUI_TRUE@ $(INSTALL_DATA) $(top_builddir)/$(PATHTOSCIRENDERER)/$(SCIRENDERERJAR) $(DESTDIR)$(pkgdatadir)/$(PATHTOSCIRENDERER)/
 
 .PHONY: macros localization doc