bug 6491 fixed - libinter.h was not installed under Linux (SEP #35 updated)

diff --git a/SEP/SEP_35_selection_of_installed_header.odt b/SEP/SEP_35_selection_of_installed_header.odt
index 23bd184..23ffd39 100644 (file)
Binary files a/SEP/SEP_35_selection_of_installed_header.odt and b/SEP/SEP_35_selection_of_installed_header.odt differ

diff --git a/scilab/CHANGES_5.2.X b/scilab/CHANGES_5.2.X
index f93038a..1893a64 100644 (file)
--- a/scilab/CHANGES_5.2.X
+++ b/scilab/CHANGES_5.2.X
@@ -225,6 +225,8 @@ Bug fixes:
 
 * bug 6489 fixed - removed a wrong dependency on 'WININET.dll' (Windows).
 
+* bug 6491 fixed - libinter.h was not installed under Linux (SEP #35 updated)
+
                Changes between version 5.2.0-beta1 and 5.2.0 of Scilab
                ==========================================================
 

diff --git a/scilab/modules/intersci/Makefile.am b/scilab/modules/intersci/Makefile.am
index 8c6fdac..cc86fe8 100644 (file)
--- a/scilab/modules/intersci/Makefile.am
+++ b/scilab/modules/intersci/Makefile.am
@@ -22,6 +22,7 @@ src/exe/opt.c \
 src/exe/check.c
 
 libsciintersci_la_includedir=$(pkgincludedir)
+libsciintersci_la_include_HEADERS = includes/libinter.h
 
 pkglib_LTLIBRARIES = libsciintersci.la
 

diff --git a/scilab/modules/intersci/Makefile.in b/scilab/modules/intersci/Makefile.in
index 628d3d5..3a270bc 100644 (file)
--- a/scilab/modules/intersci/Makefile.in
+++ b/scilab/modules/intersci/Makefile.in
@@ -38,6 +38,7 @@
 
 
 
+
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
@@ -58,7 +59,8 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = intersci$(EXEEXT)
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+DIST_COMMON = $(libsciintersci_la_include_HEADERS) \
+       $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
        $(top_srcdir)/Makefile.incl.am
 @NEED_JAVA_TRUE@am__append_1 = java
 subdir = modules/intersci
@@ -106,7 +108,8 @@ am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(bindir)" \
        "$(DESTDIR)$(libsciintersci_la_etcdir)" \
-       "$(DESTDIR)$(libsciintersci_la_rootdir)"
+       "$(DESTDIR)$(libsciintersci_la_rootdir)" \
+       "$(DESTDIR)$(libsciintersci_la_includedir)"
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
 libsciintersci_la_DEPENDENCIES =  \
        $(top_builddir)/libs/MALLOC/libscimalloc.la \
@@ -143,6 +146,7 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 SOURCES = $(libsciintersci_la_SOURCES) $(intersci_SOURCES)
 DIST_SOURCES = $(libsciintersci_la_SOURCES) $(intersci_SOURCES)
 DATA = $(libsciintersci_la_etc_DATA) $(libsciintersci_la_root_DATA)
+HEADERS = $(libsciintersci_la_include_HEADERS)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -398,6 +402,7 @@ src/exe/opt.c \
 src/exe/check.c
 
 libsciintersci_la_includedir = $(pkgincludedir)
+libsciintersci_la_include_HEADERS = includes/libinter.h
 pkglib_LTLIBRARIES = libsciintersci.la
 libsciintersci_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION)
 intersci_SOURCES = $(INTERSCI_EXE_C_SOURCES)
@@ -858,6 +863,26 @@ uninstall-libsciintersci_la_rootDATA:
        test -n "$$files" || exit 0; \
        echo " ( cd '$(DESTDIR)$(libsciintersci_la_rootdir)' && rm -f" $$files ")"; \
        cd "$(DESTDIR)$(libsciintersci_la_rootdir)" && rm -f $$files
+install-libsciintersci_la_includeHEADERS: $(libsciintersci_la_include_HEADERS)
+       @$(NORMAL_INSTALL)
+       test -z "$(libsciintersci_la_includedir)" || $(MKDIR_P) "$(DESTDIR)$(libsciintersci_la_includedir)"
+       @list='$(libsciintersci_la_include_HEADERS)'; test -n "$(libsciintersci_la_includedir)" || list=; \
+       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_HEADER) $$files '$(DESTDIR)$(libsciintersci_la_includedir)'"; \
+         $(INSTALL_HEADER) $$files "$(DESTDIR)$(libsciintersci_la_includedir)" || exit $$?; \
+       done
+
+uninstall-libsciintersci_la_includeHEADERS:
+       @$(NORMAL_UNINSTALL)
+       @list='$(libsciintersci_la_include_HEADERS)'; test -n "$(libsciintersci_la_includedir)" || list=; \
+       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+       test -n "$$files" || exit 0; \
+       echo " ( cd '$(DESTDIR)$(libsciintersci_la_includedir)' && rm -f" $$files ")"; \
+       cd "$(DESTDIR)$(libsciintersci_la_includedir)" && rm -f $$files
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
        list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -944,9 +969,10 @@ distdir: $(DISTFILES)
 check-am: all-am
        $(MAKE) $(AM_MAKEFLAGS) check-local
 check: check-am
-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) all-local
+all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS) \
+               all-local
 installdirs:
-       for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libsciintersci_la_etcdir)" "$(DESTDIR)$(libsciintersci_la_rootdir)"; do \
+       for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libsciintersci_la_etcdir)" "$(DESTDIR)$(libsciintersci_la_rootdir)" "$(DESTDIR)$(libsciintersci_la_includedir)"; do \
          test -z "$$dir" || $(MKDIR_P) "$$dir"; \
        done
 install: install-am
@@ -998,6 +1024,7 @@ info: info-am
 info-am:
 
 install-data-am: install-data-local install-libsciintersci_la_etcDATA \
+       install-libsciintersci_la_includeHEADERS \
        install-libsciintersci_la_rootDATA
 
 install-dvi: install-dvi-am
@@ -1046,6 +1073,7 @@ ps-am:
 
 uninstall-am: uninstall-binPROGRAMS \
        uninstall-libsciintersci_la_etcDATA \
+       uninstall-libsciintersci_la_includeHEADERS \
        uninstall-libsciintersci_la_rootDATA \
        uninstall-pkglibLTLIBRARIES
 
@@ -1061,6 +1089,7 @@ uninstall-am: uninstall-binPROGRAMS \
        install-dvi-am install-exec install-exec-am install-html \
        install-html-am install-html-local install-info \
        install-info-am install-libsciintersci_la_etcDATA \
+       install-libsciintersci_la_includeHEADERS \
        install-libsciintersci_la_rootDATA install-man install-pdf \
        install-pdf-am install-pkglibLTLIBRARIES install-ps \
        install-ps-am install-strip installcheck installcheck-am \
@@ -1069,6 +1098,7 @@ uninstall-am: uninstall-binPROGRAMS \
        mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
        uninstall-am uninstall-binPROGRAMS \
        uninstall-libsciintersci_la_etcDATA \
+       uninstall-libsciintersci_la_includeHEADERS \
        uninstall-libsciintersci_la_rootDATA \
        uninstall-pkglibLTLIBRARIES