From 20012187aac31214e57a7799f343738c79bf2e2e Mon Sep 17 00:00:00 2001 From: Cedric Delamarre Date: Wed, 7 Dec 2016 11:15:32 +0100 Subject: [PATCH] linux bianary fixed * two xml of dynamic module gateway was missing at installation Change-Id: Ib431368277a0bf7307488147002d6f2e2cc5af4d --- scilab/modules/history_browser/Makefile.am | 2 +- scilab/modules/history_browser/Makefile.in | 2 +- scilab/modules/ui_data/Makefile.am | 1 + scilab/modules/ui_data/Makefile.in | 32 ++++++++++++++++++++++++++-- 4 files changed, 33 insertions(+), 4 deletions(-) diff --git a/scilab/modules/history_browser/Makefile.am b/scilab/modules/history_browser/Makefile.am index ac971f6..c0c64ba 100644 --- a/scilab/modules/history_browser/Makefile.am +++ b/scilab/modules/history_browser/Makefile.am @@ -111,7 +111,7 @@ endif #### history_browser : gateway declaration #### libscihistory_browser_la_sci_gatewaydir = $(mydatadir)/sci_gateway -libscihistory_browser_la_sci_gateway_DATA = +libscihistory_browser_la_sci_gateway_DATA = sci_gateway/history_browser_gateway.xml if GUI USEANT=1 diff --git a/scilab/modules/history_browser/Makefile.in b/scilab/modules/history_browser/Makefile.in index 0bcf9e7..64448bc 100644 --- a/scilab/modules/history_browser/Makefile.in +++ b/scilab/modules/history_browser/Makefile.in @@ -734,7 +734,7 @@ SWIG_WRAPPERS = #### history_browser : gateway declaration #### libscihistory_browser_la_sci_gatewaydir = $(mydatadir)/sci_gateway -libscihistory_browser_la_sci_gateway_DATA = +libscihistory_browser_la_sci_gateway_DATA = sci_gateway/history_browser_gateway.xml @GUI_TRUE@USEANT = 1 all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-am diff --git a/scilab/modules/ui_data/Makefile.am b/scilab/modules/ui_data/Makefile.am index c8e4cc6..407c282 100644 --- a/scilab/modules/ui_data/Makefile.am +++ b/scilab/modules/ui_data/Makefile.am @@ -137,6 +137,7 @@ libsciui_data_la_LIBADD = libsciui_data-algo.la $(X_LIBS) $(X_EXTRA_LIBS) #### ui_data : gateway declaration #### libsciui_data_la_sci_gatewaydir = $(mydatadir)/sci_gateway +libsciui_data_la_sci_gateway_DATA = sci_gateway/ui_data_gateway.xml #### ui_data : icons files #### # diff --git a/scilab/modules/ui_data/Makefile.in b/scilab/modules/ui_data/Makefile.in index 5039d57..71bf153 100644 --- a/scilab/modules/ui_data/Makefile.in +++ b/scilab/modules/ui_data/Makefile.in @@ -183,6 +183,7 @@ am__uninstall_files_from_dir = { \ am__installdirs = "$(DESTDIR)$(pkglibdir)" \ "$(DESTDIR)$(libsciui_data_la_etcdir)" \ "$(DESTDIR)$(libsciui_data_la_rootdir)" \ + "$(DESTDIR)$(libsciui_data_la_sci_gatewaydir)" \ "$(DESTDIR)$(libsciui_data_la_iconsdir)" LTLIBRARIES = $(noinst_LTLIBRARIES) $(pkglib_LTLIBRARIES) libsciui_data_algo_la_LIBADD = @@ -286,6 +287,7 @@ am__can_run_installinfo = \ *) (install-info --version) >/dev/null 2>&1;; \ esac DATA = $(libsciui_data_la_etc_DATA) $(libsciui_data_la_root_DATA) \ + $(libsciui_data_la_sci_gateway_DATA) \ $(nobase_libsciui_data_la_icons_DATA) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) # Read a list of newline-separated strings from the standard input, @@ -705,6 +707,7 @@ libsciui_data_la_LIBADD = libsciui_data-algo.la $(X_LIBS) $(X_EXTRA_LIBS) #### ui_data : gateway declaration #### libsciui_data_la_sci_gatewaydir = $(mydatadir)/sci_gateway +libsciui_data_la_sci_gateway_DATA = sci_gateway/ui_data_gateway.xml #### ui_data : icons files #### # @@ -1180,6 +1183,27 @@ uninstall-libsciui_data_la_rootDATA: @list='$(libsciui_data_la_root_DATA)'; test -n "$(libsciui_data_la_rootdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(libsciui_data_la_rootdir)'; $(am__uninstall_files_from_dir) +install-libsciui_data_la_sci_gatewayDATA: $(libsciui_data_la_sci_gateway_DATA) + @$(NORMAL_INSTALL) + @list='$(libsciui_data_la_sci_gateway_DATA)'; test -n "$(libsciui_data_la_sci_gatewaydir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libsciui_data_la_sci_gatewaydir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libsciui_data_la_sci_gatewaydir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(libsciui_data_la_sci_gatewaydir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(libsciui_data_la_sci_gatewaydir)" || exit $$?; \ + done + +uninstall-libsciui_data_la_sci_gatewayDATA: + @$(NORMAL_UNINSTALL) + @list='$(libsciui_data_la_sci_gateway_DATA)'; test -n "$(libsciui_data_la_sci_gatewaydir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(libsciui_data_la_sci_gatewaydir)'; $(am__uninstall_files_from_dir) install-nobase_libsciui_data_la_iconsDATA: $(nobase_libsciui_data_la_icons_DATA) @$(NORMAL_INSTALL) @list='$(nobase_libsciui_data_la_icons_DATA)'; test -n "$(libsciui_data_la_iconsdir)" || list=; \ @@ -1293,7 +1317,7 @@ check: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) check-am all-am: Makefile $(LTLIBRARIES) $(DATA) all-local installdirs: - for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(libsciui_data_la_etcdir)" "$(DESTDIR)$(libsciui_data_la_rootdir)" "$(DESTDIR)$(libsciui_data_la_iconsdir)"; do \ + for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(libsciui_data_la_etcdir)" "$(DESTDIR)$(libsciui_data_la_rootdir)" "$(DESTDIR)$(libsciui_data_la_sci_gatewaydir)" "$(DESTDIR)$(libsciui_data_la_iconsdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: $(BUILT_SOURCES) @@ -1363,6 +1387,7 @@ info-am: install-data-am: install-data-local install-libsciui_data_la_etcDATA \ install-libsciui_data_la_rootDATA \ + install-libsciui_data_la_sci_gatewayDATA \ install-nobase_libsciui_data_la_iconsDATA install-dvi: install-dvi-am @@ -1411,6 +1436,7 @@ ps-am: uninstall-am: uninstall-libsciui_data_la_etcDATA \ uninstall-libsciui_data_la_rootDATA \ + uninstall-libsciui_data_la_sci_gatewayDATA \ uninstall-nobase_libsciui_data_la_iconsDATA \ uninstall-pkglibLTLIBRARIES @@ -1426,7 +1452,8 @@ uninstall-am: uninstall-libsciui_data_la_etcDATA \ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-html-local install-info \ install-info-am install-libsciui_data_la_etcDATA \ - install-libsciui_data_la_rootDATA install-man \ + install-libsciui_data_la_rootDATA \ + install-libsciui_data_la_sci_gatewayDATA install-man \ install-nobase_libsciui_data_la_iconsDATA install-pdf \ install-pdf-am install-pkglibLTLIBRARIES install-ps \ install-ps-am install-strip installcheck installcheck-am \ @@ -1435,6 +1462,7 @@ uninstall-am: uninstall-libsciui_data_la_etcDATA \ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ uninstall-am uninstall-libsciui_data_la_etcDATA \ uninstall-libsciui_data_la_rootDATA \ + uninstall-libsciui_data_la_sci_gatewayDATA \ uninstall-nobase_libsciui_data_la_iconsDATA \ uninstall-pkglibLTLIBRARIES -- 1.7.9.5