Install all headers into the same directory (binary, make install)
Sylvestre Ledru [Wed, 16 Sep 2009 16:43:22 +0000 (18:43 +0200)]
See SEP #32 for more information

59 files changed:
scilab/libs/MALLOC/Makefile.am
scilab/libs/doublylinkedlist/Makefile.am
scilab/libs/dynamiclibrary/Makefile.am
scilab/libs/hashtable/Makefile.am
scilab/modules/action_binding/Makefile.am
scilab/modules/api_scilab/Makefile.am
scilab/modules/arnoldi/Makefile.am
scilab/modules/boolean/Makefile.am
scilab/modules/cacsd/Makefile.am
scilab/modules/call_scilab/Makefile.am
scilab/modules/completion/Makefile.am
scilab/modules/console/Makefile.am
scilab/modules/core/Makefile.am
scilab/modules/data_structures/Makefile.am
scilab/modules/differential_equations/Makefile.am
scilab/modules/dynamic_link/Makefile.am
scilab/modules/elementary_functions/Makefile.am
scilab/modules/fftw/Makefile.am
scilab/modules/fileio/Makefile.am
scilab/modules/functions/Makefile.am
scilab/modules/graphic_export/Makefile.am
scilab/modules/graphics/Makefile.am
scilab/modules/gui/Makefile.am
scilab/modules/hdf5/Makefile.am
scilab/modules/helptools/Makefile.am
scilab/modules/history_manager/Makefile.am
scilab/modules/integer/Makefile.am
scilab/modules/interpolation/Makefile.am
scilab/modules/intersci/Makefile.am
scilab/modules/io/Makefile.am
scilab/modules/javasci/Makefile.am
scilab/modules/jvm/Makefile.am
scilab/modules/linear_algebra/Makefile.am
scilab/modules/localization/Makefile.am
scilab/modules/matio/Makefile.am
scilab/modules/metanet/Makefile.am
scilab/modules/mexlib/Makefile.am
scilab/modules/optimization/Makefile.am
scilab/modules/output_stream/Makefile.am
scilab/modules/polynomials/Makefile.am
scilab/modules/pvm/Makefile.am
scilab/modules/randlib/Makefile.am
scilab/modules/renderer/Makefile.am
scilab/modules/scicos/Makefile.am
scilab/modules/scicos_blocks/Makefile.am
scilab/modules/shell/Makefile.am
scilab/modules/signal_processing/Makefile.am
scilab/modules/sound/Makefile.am
scilab/modules/sparse/Makefile.am
scilab/modules/special_functions/Makefile.am
scilab/modules/spreadsheet/Makefile.am
scilab/modules/statistics/Makefile.am
scilab/modules/string/Makefile.am
scilab/modules/symbolic/Makefile.am
scilab/modules/tclsci/Makefile.am
scilab/modules/time/Makefile.am
scilab/modules/umfpack/Makefile.am
scilab/modules/windows_tools/Makefile.am
scilab/modules/xpad/Makefile.am

index cc74f24..293e578 100644 (file)
@@ -13,7 +13,7 @@ MALLOC_C_SOURCES = src/sci_mem_alloc.c src/getmaxMALLOC.c
 #MALLOC_C_SOURCES += src/malloc.c
 #endif
 
-libscimalloc_la_includedir=$(pkgincludedir)/malloc
+libscimalloc_la_includedir=$(pkgincludedir)
 
 libscimalloc_la_include_HEADERS = includes/sci_mem_alloc.h \
 includes/MALLOC.h \
index 582dda7..a2d6657 100644 (file)
@@ -5,7 +5,7 @@
 
 DOUBLYLINKEDLIST_C_SOURCES = src/DoublyLinkedList.c
 
-libscidoublylinkedlist_la_includedir=$(pkgincludedir)/doublylinkedlist
+libscidoublylinkedlist_la_includedir=$(pkgincludedir)
 
 libscidoublylinkedlist_la_include_HEADERS = includes/DoublyLinkedList.h
 
index cfb6307..d4648f4 100644 (file)
@@ -5,7 +5,7 @@
 
 DYNAMICLIBRARY_C_SOURCES = src/dynamiclibrary_others.c
 
-libscidynamiclibrary_la_includedir=$(pkgincludedir)/dynamiclibrary
+libscidynamiclibrary_la_includedir=$(pkgincludedir)
 
 libscidynamiclibrary_la_include_HEADERS = includes/dynamiclibrary_others.h \
 includes/dynamiclibrary.h
index 84f0e93..7a2d2c5 100644 (file)
@@ -7,7 +7,7 @@ HASHTABLE_C_SOURCES = hashtable_utility.c \
 hashtable_itr.c \
 hashtable.c
 
-libscihashtable_la_includedir=$(pkgincludedir)/hashtable
+libscihashtable_la_includedir=$(pkgincludedir)
 
 libscihashtable_la_include_HEADERS = ./hashtable_itr.h \
 ./hashtable.h \
index dcc5c1a..04a0ebf 100644 (file)
@@ -73,7 +73,7 @@ libsciaction_binding_la_sci_gatewaydir = $(mydatadir)/sci_gateway
 libsciaction_binding_la_sci_gateway_DATA =
 
 ####�action_binding : include files ####
-libsciaction_binding_la_includedir=$(pkgincludedir)/action_binding
+libsciaction_binding_la_includedir=$(pkgincludedir)
 libsciaction_binding_la_include_HEADERS = includes/dynamic_menus.h \
 includes/dynlib_action_binding.h
 
index a242d0f..fd10822 100644 (file)
@@ -65,7 +65,7 @@ libsciapi_scilab_la_etc_DATA = etc/api_scilab.quit etc/api_scilab.start
 
 
 #### api_scilab : include files ####
-libsciapi_scilab_la_includedir=$(pkgincludedir)/api_scilab
+libsciapi_scilab_la_includedir=$(pkgincludedir)
 libsciapi_scilab_la_include_HEADERS = includes/api_boolean.h \
 includes/api_boolean_sparse.h \
 includes/api_common.h \
index 683cdce..18927cc 100644 (file)
@@ -101,7 +101,7 @@ libsciarnoldi_la_sci_gatewaydir = $(mydatadir)/sci_gateway
 libsciarnoldi_la_sci_gateway_DATA = sci_gateway/arnoldi_gateway.xml
 
 #### arnoldi : include files ####
-libsciarnoldi_la_includedir=$(pkgincludedir)/arnoldi
+libsciarnoldi_la_includedir=$(pkgincludedir)
 libsciarnoldi_la_include_HEADERS = includes/gw_arnoldi.h \
        includes/dynlib_arnoldi.h
 
index 1cc8e0c..d480357 100644 (file)
@@ -54,7 +54,7 @@ libsciboolean_la_sci_gatewaydir = $(mydatadir)/sci_gateway
 libsciboolean_la_sci_gateway_DATA = sci_gateway/boolean_gateway.xml
 
 ####�boolean : include files ####
-libsciboolean_la_includedir=$(pkgincludedir)/boolean
+libsciboolean_la_includedir=$(pkgincludedir)
 libsciboolean_la_include_HEADERS = includes/gw_boolean.h \
 includes/matboolean.h
 
index 4f4651c..e671cdf 100644 (file)
@@ -239,7 +239,7 @@ libscicacsd_la_sci_gatewaydir = $(mydatadir)/sci_gateway
 libscicacsd_la_sci_gateway_DATA = sci_gateway/cacsd_gateway.xml
 
 ####�cacsd : include files ####
-libscicacsd_la_includedir=$(pkgincludedir)/cacsd
+libscicacsd_la_includedir=$(pkgincludedir)
 libscicacsd_la_include_HEADERS = includes/gw_cacsd0.h \
 includes/gw_cacsd1.h \
 includes/gw_cacsd2.h \
index 70fee59..1d8772f 100644 (file)
@@ -57,7 +57,7 @@ libscicall_scilab_la_sci_gatewaydir = $(mydatadir)/sci_gateway
 libscicall_scilab_la_sci_gateway_DATA = sci_gateway/call_scilab_gateway.xml
 
 #### call_scilab : include files ####
-libscicall_scilab_la_includedir=$(pkgincludedir)/call_scilab
+libscicall_scilab_la_includedir=$(pkgincludedir)
 libscicall_scilab_la_include_HEADERS = includes/CallScilab.h \
        includes/fromjava.h \
        includes/dynlib_call_scilab.h
index ceafb87..bbed6ea 100644 (file)
@@ -75,7 +75,7 @@ libscicompletion_la_sci_gatewaydir = $(mydatadir)/sci_gateway
 libscicompletion_la_sci_gateway_DATA = sci_gateway/completion_gateway.xml
 
 #### completion : include files ####
-libscicompletion_la_includedir=$(pkgincludedir)/completion
+libscicompletion_la_includedir=$(pkgincludedir)
 libscicompletion_la_include_HEADERS = includes/gw_completion.h \
 includes/completion.h \
 includes/getCommonPart.h \
index 8c1a1a6..338ce32 100644 (file)
@@ -102,7 +102,7 @@ libsciconsole_la_LIBADD =  $(top_builddir)/modules/action_binding/libsciaction_b
 SWIG_WRAPPERS = src/jni/GuiManagement.i
 
 #### console : include files ####
-libsciconsole_la_includedir=$(pkgincludedir)/console
+libsciconsole_la_includedir=$(pkgincludedir)
 libsciconsole_la_include_HEADERS = includes/ClearConsole.h \
 includes/dynlib_console.h \
 includes/ClearConsolePart.h \
index a4db88b..17d313a 100644 (file)
@@ -335,7 +335,7 @@ libscicore_la_xmldir = $(mydatadir)/xml
 libscicore_la_xml_DATA = xml/modules.dtd xml/version.dtd
 
 #### core : include files ####
-libscicore_la_includedir=$(pkgincludedir)/core
+libscicore_la_includedir=$(pkgincludedir)
 libscicore_la_include_HEADERS = \
 includes/BOOL.h \
 includes/callFunctionFromGateway.h \
index 3789109..af1f0ff 100644 (file)
@@ -89,7 +89,7 @@ libscidata_structures_la_sci_gateway_DATA = sci_gateway/data_structures_gateway.
 
 
 #### data_structures : include files ####
-libscidata_structures_la_includedir=$(pkgincludedir)/data_structures
+libscidata_structures_la_includedir=$(pkgincludedir)
 libscidata_structures_la_include_HEADERS = includes/gw_data_structures1.h \
 includes/gw_data_structures2.h
 
index f66e7b4..c1405ed 100644 (file)
@@ -161,7 +161,7 @@ libscidifferential_equations_la_sci_gatewaydir = $(mydatadir)/sci_gateway
 libscidifferential_equations_la_sci_gateway_DATA = sci_gateway/differential_equations_gateway.xml
 
 #### differential_equations : include files ####
-libscidifferential_equations_la_includedir=$(pkgincludedir)/differential_equations
+libscidifferential_equations_la_includedir=$(pkgincludedir)
 libscidifferential_equations_la_include_HEADERS = includes/gw_differential_equations1.h \
 includes/gw_differential_equations2.h \
 includes/gw_differential_equations3.h \
index 562a1b3..ddeb25c 100644 (file)
@@ -57,7 +57,7 @@ libscidynamic_link_la_sci_gatewaydir = $(mydatadir)/sci_gateway
 libscidynamic_link_la_sci_gateway_DATA = sci_gateway/dynamic_link_gateway.xml
 
 #### dynamic_link : include files ####
-libscidynamic_link_la_includedir=$(pkgincludedir)/dynamic_link
+libscidynamic_link_la_includedir=$(pkgincludedir)
 libscidynamic_link_la_include_HEADERS = includes/AddFunctionInTable.h \
 includes/addinter.h \
 includes/dynamic_link.h \
index 3869073..90ff8e2 100644 (file)
@@ -458,7 +458,7 @@ libscielementary_functions_la_sci_gateway_DATA = sci_gateway/elementary_function
 
 
 #### elementary_functions : include files ####
-libscielementary_functions_la_includedir=$(pkgincludedir)/elementary_functions
+libscielementary_functions_la_includedir=$(pkgincludedir)
 libscielementary_functions_la_include_HEADERS = includes/sci_tools.h \
 includes/gw_elementary_functions.h \
 includes/elementary_functions.h \
index 61f4301..b00997a 100644 (file)
@@ -62,7 +62,7 @@ libscifftw_la_CFLAGS=         -I$(srcdir)/includes/ \
                        $(FFTW3_CFLAGS)
 
 #### fftw : include files ####
-libscifftw_la_includedir=$(pkgincludedir)/fftw
+libscifftw_la_includedir=$(pkgincludedir)
 libscifftw_la_include_HEADERS = includes/gw_fftw.h \
 includes/dynlib_fftw.h \
 includes/with_fftw.h
index 0f11210..f5d286e 100644 (file)
@@ -141,7 +141,7 @@ libscifileio_la_sci_gatewaydir = $(mydatadir)/sci_gateway
 libscifileio_la_sci_gateway_DATA = sci_gateway/fileio_gateway.xml
 
 #### fileio : include files ####
-libscifileio_la_includedir=$(pkgincludedir)/fileio
+libscifileio_la_includedir=$(pkgincludedir)
 libscifileio_la_include_HEADERS = includes/FileExist.h \
 includes/gw_fileio.h \
 includes/findfiles.h \
index 52f9eac..c15d318 100644 (file)
@@ -71,7 +71,7 @@ libscifunctions_la_sci_gatewaydir = $(mydatadir)/sci_gateway
 libscifunctions_la_sci_gateway_DATA = sci_gateway/functions_gateway.xml
 
 #### functions : include files ####
-libscifunctions_la_includedir=$(pkgincludedir)/functions
+libscifunctions_la_includedir=$(pkgincludedir)
 libscifunctions_la_include_HEADERS = includes/gw_functions.h \
        includes/librarieslist.h \
        includes/libraryinfo.h \
index e82c71c..673fd0e 100644 (file)
@@ -112,7 +112,7 @@ libscigraphic_export_la_sci_gatewaydir = $(mydatadir)/sci_gateway
 libscigraphic_export_la_sci_gateway_DATA = sci_gateway/graphic_export_gateway.xml
 
 #### graphic_export : include files ####
-libscigraphic_export_la_includedir=$(pkgincludedir)/graphic_export
+libscigraphic_export_la_includedir=$(pkgincludedir)
 libscigraphic_export_la_include_HEADERS = includes/gw_graphic_export.h \
 includes/dynlib_graphic_export.h
 
index 36d9ee6..c2207cd 100644 (file)
@@ -445,7 +445,7 @@ libscigraphics_la_sci_gatewaydir = $(mydatadir)/sci_gateway
 libscigraphics_la_sci_gateway_DATA = sci_gateway/graphics_gateway.xml
 
 #### graphics : include files ####
-libscigraphics_la_includedir=$(pkgincludedir)/graphics
+libscigraphics_la_includedir=$(pkgincludedir)
 libscigraphics_la_include_HEADERS = includes/GetCommandArg.h \
 includes/DefaultCommandArg.h \
 includes/Axes.h \
index 8539f5e..e256444 100644 (file)
@@ -278,7 +278,7 @@ libscigui_la_sci_gateway_DATA = sci_gateway/gui_gateway.xml
 
 
 #### gui : include files ####
-libscigui_la_includedir=$(pkgincludedir)/gui
+libscigui_la_includedir=$(pkgincludedir)
 libscigui_la_include_HEADERS = includes/gw_gui.h \
 includes/GraphicWindow.h \
 includes/InitializeGUI.h \
index 9afb885..9eefba5 100644 (file)
@@ -81,7 +81,7 @@ libscihdf5_la_etc_DATA = etc/hdf5.quit etc/hdf5.start
 
 
 #### hdf5 : include files ####
-libscihdf5_la_includedir=$(pkgincludedir)/hdf5
+libscihdf5_la_includedir=$(pkgincludedir)
 libscihdf5_la_include_HEADERS = includes/gw_hdf5.h \
 includes/h5_attributeConstants.h \
 includes/h5_fileManagement.h \
index 8e72d8c..ccb2c60 100644 (file)
@@ -68,7 +68,7 @@ libscihelptools_la_etc_DATA = etc/helptools.quit etc/helptools.start
 
 
 #### helptools : include files ####
-libscihelptools_la_includedir=$(pkgincludedir)/helptools
+libscihelptools_la_includedir=$(pkgincludedir)
 libscihelptools_la_include_HEADERS = includes/gw_helptools.h \
        includes/dynlib_helptools.h
 
index 822eaa9..2b4521f 100644 (file)
@@ -84,7 +84,7 @@ libscihistory_manager_la_sci_gatewaydir = $(mydatadir)/sci_gateway
 libscihistory_manager_la_sci_gateway_DATA = sci_gateway/history_manager_gateway.xml
 
 #### history_manager : include files ####
-libscihistory_manager_la_includedir=$(pkgincludedir)/history_manager
+libscihistory_manager_la_includedir=$(pkgincludedir)
 libscihistory_manager_la_include_HEADERS = includes/gw_history_manager.h \
 includes/HistoryManager.h \
 includes/InitializeHistoryManager.h \
index b9f726e..b0c2bf4 100644 (file)
@@ -151,7 +151,7 @@ libsciinteger_la_sci_gatewaydir = $(mydatadir)/sci_gateway
 libsciinteger_la_sci_gateway_DATA = sci_gateway/integer_gateway.xml
 
 #### integer : include files ####
-libsciinteger_la_includedir=$(pkgincludedir)/integer
+libsciinteger_la_includedir=$(pkgincludedir)
 libsciinteger_la_include_HEADERS = includes/gw_integer.h \
 includes/def.h \
 includes/db2int.h \
index 08db30a..c3842bc 100644 (file)
@@ -69,7 +69,7 @@ libsciinterpolation_la_sci_gatewaydir = $(mydatadir)/sci_gateway
 libsciinterpolation_la_sci_gateway_DATA = sci_gateway/interpolation_gateway.xml
 
 ####�interpolation : include files ####
-libsciinterpolation_la_includedir=$(pkgincludedir)/interpolation
+libsciinterpolation_la_includedir=$(pkgincludedir)
 libsciinterpolation_la_include_HEADERS = includes/gw_interpolation.h \
        includes/dynlib_interpolation.h
 
index 337710b..8c6fdac 100644 (file)
@@ -21,7 +21,7 @@ src/exe/declare.c \
 src/exe/opt.c \
 src/exe/check.c
 
-libsciintersci_la_includedir=$(pkgincludedir)/intersci
+libsciintersci_la_includedir=$(pkgincludedir)
 
 pkglib_LTLIBRARIES = libsciintersci.la
 
index 10a3761..38ba9ca 100644 (file)
@@ -94,7 +94,7 @@ libsciio_la_sci_gatewaydir = $(mydatadir)/sci_gateway
 libsciio_la_sci_gateway_DATA = sci_gateway/io_gateway.xml
 
 ####�io : include files ####
-libsciio_la_includedir=$(pkgincludedir)/io
+libsciio_la_includedir=$(pkgincludedir)
 libsciio_la_include_HEADERS = includes/gw_io.h \
 includes/getenvc.h \
 includes/setenvc.h \
index db7b48d..f789af8 100644 (file)
@@ -65,7 +65,7 @@ libjavasci_la_LIBADD = \
        $(top_builddir)/modules/libscilab.la
 
 #### javasci : include files ####
-libjavasci_la_includedir=$(pkgincludedir)/javasci
+libjavasci_la_includedir=$(pkgincludedir)
 libjavasci_la_include_HEADERS = includes/javasci_Scilab.h \
 includes/javasci_Scilab2.h \
 includes/javasci_globals.h \
index b0509b7..ead25d6 100644 (file)
@@ -57,7 +57,7 @@ libscijvm_la_sci_gatewaydir = $(mydatadir)/sci_gateway
 libscijvm_la_sci_gateway_DATA = sci_gateway/jvm_gateway.xml
 
 #### jvm : include files ####
-libscijvm_la_includedir=$(pkgincludedir)/jvm
+libscijvm_la_includedir=$(pkgincludedir)
 libscijvm_la_include_HEADERS = includes/TerminateJVM.h \
 includes/getScilabJavaVM.h \
 includes/getScilabJNIEnv.h \
index 4cc1942..f407459 100644 (file)
@@ -124,7 +124,7 @@ libscilinear_algebra_la_sci_gateway_DATA = sci_gateway/linear_algebra_gateway.xm
 
 
 #### linear_algebra : include files ####
-libscilinear_algebra_la_includedir=$(pkgincludedir)/linear_algebra
+libscilinear_algebra_la_includedir=$(pkgincludedir)
 libscilinear_algebra_la_include_HEADERS = includes/gw_linear_algebra.h \
 includes/gw_linear_algebra2.h \
 includes/issymmetric.h \
index 8a8dd76..9d56058 100644 (file)
@@ -73,7 +73,7 @@ libscilocalization_la_sci_gateway_DATA = sci_gateway/localization_gateway.xml
 
 
 ####localization : include files ####
-libscilocalization_la_includedir=$(pkgincludedir)/localization
+libscilocalization_la_includedir=$(pkgincludedir)
 libscilocalization_la_include_HEADERS = includes/localization.h \
 includes/gw_localization.h \
 includes/InitializeLocalization.h \
index a20a7fa..66768b5 100644 (file)
@@ -75,6 +75,6 @@ libscimatio_la_sci_gatewaydir = $(mydatadir)/sci_gateway
 libscimatio_la_sci_gateway_DATA = sci_gateway/matio_gateway.xml
 
 #### matio : include files ####
-libscimatio_la_includedir=$(pkgincludedir)/matio
+libscimatio_la_includedir=$(pkgincludedir)
 libscimatio_la_include_HEADERS = includes/gw_matio.h \
        includes/dynlib_matio.h
index 0ad7ba6..307248b 100644 (file)
@@ -152,7 +152,7 @@ libscimetanet_la_sci_gatewaydir = $(mydatadir)/sci_gateway
 libscimetanet_la_sci_gateway_DATA = sci_gateway/metanet_gateway.xml
 
 #### metanet : include files ####
-libscimetanet_la_includedir=$(pkgincludedir)/metanet
+libscimetanet_la_includedir=$(pkgincludedir)
 libscimetanet_la_include_HEADERS = includes/gw_metanet.h \
 includes/dynlib_metanet.h
 
index df53f67..c0909c0 100644 (file)
@@ -60,7 +60,7 @@ libmex_la_etc_DATA = etc/mexlib.quit etc/mexlib.start
 
 
 #### mexlib : include files ####
-libmex_la_includedir=$(pkgincludedir)/mexlib
+libmex_la_includedir=$(pkgincludedir)
 libmex_la_include_HEADERS = includes/mex.h \
 includes/sci_gateway.h
 
index b109edd..318c85b 100644 (file)
@@ -151,7 +151,7 @@ libscioptimization_la_etc_DATA = etc/optimization.quit etc/optimization.start
 libscioptimization_la_sci_gatewaydir = $(mydatadir)/sci_gateway
 libscioptimization_la_sci_gateway_DATA = sci_gateway/optimization_gateway.xml
 ####optimization : include files ####
-libscioptimization_la_includedir=$(pkgincludedir)/optimization
+libscioptimization_la_includedir=$(pkgincludedir)
 libscioptimization_la_include_HEADERS = includes/gw_optimization.h \
 includes/dynlib_optimization.h \
 includes/spd.h 
index fe9b719..92ad317 100644 (file)
@@ -108,7 +108,7 @@ libscioutput_stream_la_sci_gatewaydir = $(mydatadir)/sci_gateway
 libscioutput_stream_la_sci_gateway_DATA = sci_gateway/output_stream_gateway.xml
 
 #### output_stream : include files ####
-libscioutput_stream_la_includedir=$(pkgincludedir)/output_stream
+libscioutput_stream_la_includedir=$(pkgincludedir)
 libscioutput_stream_la_include_HEADERS = includes/cerro.h \
 includes/erro.h \
 includes/do_error_number.h \
index 826c52d..d2dc98d 100644 (file)
@@ -139,7 +139,7 @@ libscipolynomials_la_sci_gateway_DATA = sci_gateway/polynomials_gateway.xml
 
 
 #### polynomials : include files ####
-libscipolynomials_la_includedir=$(pkgincludedir)/polynomials
+libscipolynomials_la_includedir=$(pkgincludedir)
 libscipolynomials_la_include_HEADERS = includes/gw_polynomials.h \
 includes/dynlib_polynomials.h
 
index f5fb959..0d16dfc 100644 (file)
@@ -85,7 +85,7 @@ libscipvm_la_sci_gatewaydir = $(mydatadir)/sci_gateway
 libscipvm_la_sci_gateway_DATA = sci_gateway/pvm_gateway.xml
 
 #### pvm : include files ####
-libscipvm_la_includedir=$(pkgincludedir)/pvm
+libscipvm_la_includedir=$(pkgincludedir)
 libscipvm_la_include_HEADERS = includes/gw_pvm.h \
 includes/with_pvm.h \
 includes/dynlib_pvm.h
index a03a5a3..53a8a9f 100644 (file)
@@ -78,7 +78,7 @@ libscirandlib_la_sci_gatewaydir = $(mydatadir)/sci_gateway
 libscirandlib_la_sci_gateway_DATA = sci_gateway/randlib_gateway.xml
 
 #### randlib : include files ####
-libscirandlib_la_includedir=$(pkgincludedir)/randlib
+libscirandlib_la_includedir=$(pkgincludedir)
 libscirandlib_la_include_HEADERS = includes/grand.h \
 includes/clcg4.h \
 includes/others_generators.h \
index f7a0c64..835622e 100644 (file)
@@ -390,7 +390,7 @@ libscirenderer_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION)
 #libscirenderer_la_sci_gateway_DATA = sci_gateway/renderer_gateway.xml
 
 #### renderer : include files ####
-libscirenderer_la_includedir=$(pkgincludedir)/renderer
+libscirenderer_la_includedir=$(pkgincludedir)
 libscirenderer_la_include_HEADERS = includes/gw_renderer.h \
 includes/BuildDrawingObserver.h \
 includes/DrawingBridge.h \
index 383fbf0..f61bfdb 100644 (file)
@@ -132,7 +132,7 @@ libsciscicos_la_sci_gateway_DATA = sci_gateway/scicos_gateway.xml
 
 
 #### scicos : include files ####
-libsciscicos_la_includedir=$(pkgincludedir)/scicos
+libsciscicos_la_includedir=$(pkgincludedir)
 libsciscicos_la_include_HEADERS = includes/intcscicos.h \
 includes/scicos.h \
 includes/gw_scicos.h \
@@ -279,7 +279,7 @@ libsciscicos_la_CFLAGS= -I$(top_srcdir)/modules/output_stream/includes \
 -I$(top_srcdir)/modules/api_scilab/includes \
 -I$(top_srcdir)/modules/scicos/includes
 
-libsciscicos_la_includedir=$(pkgincludedir)/scicos
+libsciscicos_la_includedir=$(pkgincludedir)
 libsciscicos_la_include_HEADERS = src/c/noscicos/resource.h
 
 #### scicos : init scripts ####
index 20dc2e7..261267c 100644 (file)
@@ -463,7 +463,7 @@ libsciscicos_blocks_la_etcdir = $(mydatadir)/etc
 libsciscicos_blocks_la_etc_DATA = etc/scicos_blocks.quit etc/scicos_blocks.start
 
 #### scicos_blocks : include files ####
-libsciscicos_blocks_la_includedir=$(pkgincludedir)/scicos_blocks
+libsciscicos_blocks_la_includedir=$(pkgincludedir)
 libsciscicos_blocks_la_include_HEADERS = includes/scicos_block.h \
 includes/scicos_block4.h \
 includes/scoBase.h \
index 0c20220..31e506d 100644 (file)
@@ -88,7 +88,7 @@ libscishell_la_sci_gatewaydir = $(mydatadir)/sci_gateway
 libscishell_la_sci_gateway_DATA = sci_gateway/shell_gateway.xml
 
 #### shell : include files ####
-libscishell_la_includedir=$(pkgincludedir)/shell
+libscishell_la_includedir=$(pkgincludedir)
 libscishell_la_include_HEADERS = includes/gw_shell.h \
 includes/scilines.h \
 includes/InitializeShell.h \
index b4aa85e..9abcd53 100644 (file)
@@ -127,7 +127,7 @@ libscisignal_processing_la_sci_gatewaydir = $(mydatadir)/sci_gateway
 libscisignal_processing_la_sci_gateway_DATA = sci_gateway/signal_processing_gateway.xml
 
 ####�signal_processing : include files ####
-libscisignal_processing_la_includedir=$(pkgincludedir)/signal_processing
+libscisignal_processing_la_includedir=$(pkgincludedir)
 libscisignal_processing_la_include_HEADERS = includes/gw_signal.h \
 includes/dynlib_signal_processing.h
 
index f89869a..39dd11f 100644 (file)
@@ -46,7 +46,7 @@ libscisound_la_sci_gatewaydir = $(mydatadir)/sci_gateway
 libscisound_la_sci_gateway_DATA = sci_gateway/sound_gateway.xml
 
 ####�sound : include files ####
-libscisound_la_includedir=$(pkgincludedir)/sound
+libscisound_la_includedir=$(pkgincludedir)
 libscisound_la_include_HEADERS = includes/gw_sound.h \
                includes/dynlib_sound.h
                
index 4b50765..e59a081 100644 (file)
@@ -194,7 +194,7 @@ libscisparse_la_sci_gatewaydir = $(mydatadir)/sci_gateway
 libscisparse_la_sci_gateway_DATA = sci_gateway/sparse_gateway.xml
 
 #### sparse : include files ####
-libscisparse_la_includedir=$(pkgincludedir)/sparse
+libscisparse_la_includedir=$(pkgincludedir)
 libscisparse_la_include_HEADERS = includes/gw_sparse.h \
 includes/spmalloc.h \
 includes/sp.h \
index f0df185..c8930f7 100644 (file)
@@ -31,7 +31,7 @@ sci_gateway/fortran/sci_f_oldbesselj.f \
 sci_gateway/fortran/sci_f_oldbesselk.f \
 sci_gateway/fortran/sci_f_calerf.f
 
-libscispecial_functions_la_includedir=$(pkgincludedir)/special_functions
+libscispecial_functions_la_includedir=$(pkgincludedir)
 
 libscispecial_functions_la_include_HEADERS = includes/gw_special_functions1.h \
 includes/gw_special_functions2.h
index 3a89f07..bda2abe 100644 (file)
@@ -56,7 +56,7 @@ libscispreadsheet_la_sci_gatewaydir = $(mydatadir)/sci_gateway
 libscispreadsheet_la_sci_gateway_DATA = sci_gateway/spreadsheet_gateway.xml
 
 ####�spreadsheet : include files ####
-libscispreadsheet_la_includedir=$(pkgincludedir)/spreadsheet
+libscispreadsheet_la_includedir=$(pkgincludedir)
 libscispreadsheet_la_include_HEADERS = includes/gw_spreadsheet.h \
                includes/dynlib_spreadsheet.h
 
index 743340d..f93026a 100644 (file)
@@ -118,7 +118,7 @@ libscistatistics_la_sci_gateway_DATA = sci_gateway/statistics_gateway.xml
 
 
 #### statistics : include files ####
-libscistatistics_la_includedir=$(pkgincludedir)/statistics
+libscistatistics_la_includedir=$(pkgincludedir)
 libscistatistics_la_include_HEADERS = includes/gw_statistics.h \
 includes/dynlib_statistics.h \
 includes/ipmpar1.h
index 30b5a9f..db20254 100644 (file)
@@ -105,7 +105,7 @@ libscistring_la_sci_gatewaydir = $(mydatadir)/sci_gateway
 libscistring_la_sci_gateway_DATA = sci_gateway/string_gateway.xml
 
 #### string : include files ####
-libscistring_la_includedir=$(pkgincludedir)/string
+libscistring_la_includedir=$(pkgincludedir)
 libscistring_la_include_HEADERS = includes/men_Sutils.h \
 includes/gw_string.h includes/InitializeString.h \
 includes/cvstr.h includes/getfastcode.h \
index 70d5a0b..37565f8 100644 (file)
@@ -56,7 +56,7 @@ libscisymbolic_la_sci_gateway_DATA = sci_gateway/symbolic_gateway.xml
 
 
 #### symbolic : include files ####
-libscisymbolic_la_includedir=$(pkgincludedir)/symbolic
+libscisymbolic_la_includedir=$(pkgincludedir)
 libscisymbolic_la_include_HEADERS = includes/gw_symbolic.h \
 includes/dynlib_symbolic.h
 
index c58ea87..f46b9c5 100644 (file)
@@ -248,7 +248,7 @@ libscitclsci_la_sci_gatewaydir = $(mydatadir)/sci_gateway
 libscitclsci_la_sci_gateway_DATA = sci_gateway/tclsci_gateway.xml
 
 #### tclsci : include files ####
-libscitclsci_la_includedir=$(pkgincludedir)/tclsci
+libscitclsci_la_includedir=$(pkgincludedir)
 libscitclsci_la_include_HEADERS = includes/setenvtcl.h \
 includes/GedManagement.h \
 includes/TCL_Global.h \
index 6f23cb7..c5eeb76 100644 (file)
@@ -55,7 +55,7 @@ libscitime_la_sci_gatewaydir = $(mydatadir)/sci_gateway
 libscitime_la_sci_gateway_DATA = sci_gateway/time_gateway.xml
 
 #### time : include files ####
-libscitime_la_includedir=$(pkgincludedir)/time
+libscitime_la_includedir=$(pkgincludedir)
 libscitime_la_include_HEADERS = includes/gw_time.h \
 includes/dynlib_time.h \
 includes/realtime.h \
index b5a001f..cce37b5 100644 (file)
@@ -74,7 +74,7 @@ libsciumfpack_la_CFLAGS= -I$(srcdir)/includes/ \
                        -I$(top_srcdir)/modules/mexlib/includes
 
 #### umfpack : include files ####
-libsciumfpack_la_includedir=$(pkgincludedir)/umfpack
+libsciumfpack_la_includedir=$(pkgincludedir)
 libsciumfpack_la_include_HEADERS = includes/gw_umfpack.h \
 includes/with_umfpack.h \
 includes/dynlib_umfpack.h
index d456b9c..ba3b7fb 100644 (file)
@@ -41,7 +41,7 @@ libsciwindows_tools_la_sci_gatewaydir = $(mydatadir)/sci_gateway
 libsciwindows_tools_la_sci_gateway_DATA = sci_gateway/windows_tools_gateway.xml
 
 #### windows_tools : include files ####
-libsciwindows_tools_la_includedir=$(pkgincludedir)/windows_tools
+libsciwindows_tools_la_includedir=$(pkgincludedir)
 libsciwindows_tools_la_include_HEADERS = includes/gw_windows_tools.h \
 includes/dynlib_windows_tools.h
 
index e2fdd58..b6a0406 100644 (file)
@@ -104,7 +104,7 @@ libscixpad_la_sci_gateway_DATA = sci_gateway/xpad_gateway.xml
 
 
 #### xpad : include files ####
-libscixpad_la_includedir=$(pkgincludedir)/xpad
+libscixpad_la_includedir=$(pkgincludedir)
 libscixpad_la_include_HEADERS = includes/gw_xpad.h \
 includes/dynlib_xpad.h \
 includes/callxpad.h