Change in the make install ...
Sylvestre Ledru [Wed, 25 Apr 2007 09:23:36 +0000 (09:23 +0000)]
60 files changed:
scilab/Makefile.am
scilab/Makefile.incl.am
scilab/libs/MALLOC/Makefile.am
scilab/libs/blas/Makefile.am
scilab/libs/hashtable/Makefile.am
scilab/libs/lapack/Makefile.am
scilab/libs/libst/Makefile.am
scilab/modules/Makefile.am
scilab/modules/arnoldi/Makefile.am
scilab/modules/boolean/Makefile.am
scilab/modules/cacsd/Makefile.am
scilab/modules/compatibility_functions/Makefile.am
scilab/modules/core/Makefile.am
scilab/modules/data_structures/Makefile.am
scilab/modules/development_tools/Makefile.am
scilab/modules/differential_equations/Makefile.am
scilab/modules/double/Makefile.am
scilab/modules/elementaries_functions/Makefile.am
scilab/modules/fftw/Makefile.am
scilab/modules/fileio/Makefile.am
scilab/modules/functions/Makefile.am
scilab/modules/graphics/Makefile.am
scilab/modules/gui/Makefile.am
scilab/modules/helptools/Makefile.am
scilab/modules/incremental_link/Makefile.am
scilab/modules/incremental_link/src/scripts/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/m2sci/Makefile.am
scilab/modules/maple2scilab/Makefile.am
scilab/modules/metanet/Makefile.am
scilab/modules/mexlib/Makefile.am
scilab/modules/optimization/Makefile.am
scilab/modules/others/Makefile.am
scilab/modules/overloading/Makefile.am
scilab/modules/polynomials/Makefile.am
scilab/modules/pvm/Makefile.am
scilab/modules/randlib/Makefile.am
scilab/modules/sci2c/Makefile.am
scilab/modules/scicos/Makefile.am
scilab/modules/scilab2fortran/Makefile.am
scilab/modules/scipad/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/statistics/Makefile.am
scilab/modules/string/Makefile.am
scilab/modules/string_V2/Makefile.am
scilab/modules/symbolic/Makefile.am
scilab/modules/tclsci/Makefile.am
scilab/modules/texmacs/Makefile.am
scilab/modules/time/Makefile.am
scilab/modules/wintools/Makefile.am

index 2726899..0f4fd29 100644 (file)
@@ -23,7 +23,8 @@ scilab_bin_SOURCES            = $(top_srcdir)/modules/core/src/c/main_linux.c
 scilab_bin_LDADD = $(top_builddir)/modules/libscilab.la \
        $(X_EXTRA_LIBS) -lXt -lX11 -lSM
 
-sysconf_DATA = $(top_srcdir)/etc/scilab.start \
+rootdir=$(pkgdatadir)/etc/
+root_DATA = $(top_srcdir)/etc/scilab.start \
 $(top_srcdir)/etc/scilab.quit
 
 all: macros
index e7cbf38..14f769f 100644 (file)
@@ -6,11 +6,8 @@
 ### Target, variable, suffixes which are supposed to be usefull in every makefile.am
 ##########
 
-# Where headers (*.h) are installed (usually /usr/include/scilab/)
-sciincludedir=${includedir}/scilab
-
 # Where all the Scilab stuff is installed (macros, help, ...)
-datadir=${datarootdir}/scilab/modules
+mydatadir=$(pkgdatadir)/modules/$(modulename)
 
 #SUFFIXES = .xml .sci .htm
 SUFFIXES = .sci .java .class .jar
@@ -79,7 +76,7 @@ macrossly:
 # we are building Scilab
 
 # Where it should be installed
-pkgdocdir = $(target)
+pkgdocdir = $(mydatadir)
 # Which directories we have to install
 DOCDIRS = help/fr_FR help/en_US
 # What is the mask of the help output
@@ -117,7 +114,7 @@ endif
 ########### INSTALL DATA ###################
 # Install macros
 # Where it should be installed
-pkgmacrosdir = $(target)
+pkgmacrosdir = $(mydatadir)
 # Which directory we process
 MACRODIRS = macros/
 # Mask of the Scilab sources macros
index 3df96e2..159e094 100644 (file)
@@ -5,7 +5,7 @@
 
 MALLOC_C_SOURCES = src/sci_mem_alloc.c src/getmaxMALLOC.c
 
-libscimalloc_la_includedir=$(sciincludedir)/malloc
+libscimalloc_la_includedir=$(pkgincludedir)/malloc
 
 libscimalloc_la_include_HEADERS = includes/sci_mem_alloc.h \
 includes/MALLOC.h \
@@ -20,6 +20,6 @@ libscimalloc_la_SOURCES = $(MALLOC_C_SOURCES)
 libscimalloc_la_LIBADD = 
 
 #### Target ######
-target=$(datadir)/modules/malloc
+modulename=malloc
 
 include $(top_srcdir)/Makefile.incl.am
index 1609382..52a6639 100644 (file)
@@ -76,7 +76,6 @@ zherk.f \
 dsymm.f \
 zher2.f
 
-
 pkglib_LTLIBRARIES = libsciblas.la
 
 libsciblas_la_SOURCES = $(BLAS_FORTRAN_SOURCES)
@@ -84,8 +83,7 @@ libsciblas_la_SOURCES = $(BLAS_FORTRAN_SOURCES)
 libsciblas_la_LIBADD =
 
 #### Target ######
-target=$(datadir)/modules/blas
-
+modulename=blas
 
 include $(top_srcdir)/Makefile.incl.am
 
index 9de3881..02b3481 100644 (file)
@@ -8,7 +8,7 @@ hashtable_itr.c \
 hashtable.c
 
 
-libscihashtable_la_includedir=$(sciincludedir)/hashtable
+libscihashtable_la_includedir=$(pkgincludedir)/hashtable
 
 libscihashtable_la_include_HEADERS = ./hashtable_itr.h \
 ./hashtable.h \
@@ -23,6 +23,6 @@ libscihashtable_la_SOURCES = $(HASHTABLE_C_SOURCES)
 libscihashtable_la_LIBADD = 
 
 #### Target ######
-target=$(datadir)/modules/hashtable
+modulename=hashtable
 
 include $(top_srcdir)/Makefile.incl.am
\ No newline at end of file
index 2625132..caa6896 100644 (file)
@@ -4,7 +4,7 @@
 ##########
 
 #### Target ######
-target=$(datadir)/modules/lapack
+modulename=lapack
 
 pkglib_LTLIBRARIES = libscilapack.la 
 
index 5238ba4..ce15bd2 100644 (file)
@@ -13,6 +13,6 @@ libscilibst_la_SOURCES = $(LIBST_C_SOURCES)
 libscilibst_la_LIBADD =
 
 #### Target ######
-target=$(datadir)/modules/libst
+modulename=libst
 
 include $(top_srcdir)/Makefile.incl.am
index 7e9fe54..ac46bfa 100644 (file)
@@ -65,6 +65,10 @@ if PVM
 SUBDIRS += pvm
 endif
 
+if MPI
+SUBDIRS += mpi
+endif
+
 SUBDIRS += .
 
 # javasci should be compile at the end because it needs libscilab.la
@@ -76,10 +80,10 @@ endif
 
 
 #### Target ######
-target=$(datadir)/
+mydatadir=$(datadir)/
 
 #### Basic files ####
-libscilab_la_rootdir = $(target)
+libscilab_la_rootdir = $(mydatadir)
 libscilab_la_root_DATA = modules
 
 # 
@@ -129,6 +133,10 @@ if PVM
 libscilab_la_LIBADD += $(top_builddir)/modules/pvm/libscipvm.la
 endif
 
+if MPI
+libscilab_la_LIBADD += $(top_builddir)/modules/mpi/libscimpi.la
+endif
+
 if FFTW
 libscilab_la_LIBADD += $(top_builddir)/modules/fftw/libscifftw.la
 endif
index b2363f7..0465585 100644 (file)
@@ -65,7 +65,7 @@ sci_gateway/c/sci_dneupd.c \
 sci_gateway/c/sci_dsaupd.c \
 sci_gateway/c/sci_znaupd.c
 
-libsciarnoldi_la_includedir=$(sciincludedir)/arnoldi
+libsciarnoldi_la_includedir=$(pkgincludedir)/arnoldi
 
 libsciarnoldi_la_include_HEADERS = 
 
@@ -88,20 +88,20 @@ $(top_builddir)/libs/MALLOC/libscimalloc.la
 
 
 #### Target ######
-target=$(datadir)/modules/arnoldi
+modulename=arnoldi
 
 
 #### arnoldi : Conf files ####
-libsciarnoldi_la_rootdir = $(target)
+libsciarnoldi_la_rootdir = $(mydatadir)
 libsciarnoldi_la_root_DATA = changelog.txt licence.txt readme.txt VERSION.xml
 
 
 #### arnoldi : init scripts #### 
-libsciarnoldi_la_etcdir = $(target)/etc
+libsciarnoldi_la_etcdir = $(mydatadir)/etc
 libsciarnoldi_la_etc_DATA = etc/arnoldi.quit etc/arnoldi.start
 
 #### arnoldi : gateway declaration #### 
-libsciarnoldi_la_sci_gatewaydir = $(target)/sci_gateway
+libsciarnoldi_la_sci_gatewaydir = $(mydatadir)/sci_gateway
 libsciarnoldi_la_sci_gateway_DATA = sci_gateway/arnoldi_gateway.xml
 
 include $(top_srcdir)/Makefile.incl.am
index 4f0ebe8..6321be2 100644 (file)
@@ -36,25 +36,23 @@ libsciboolean_la_LIBADD = \
 #      echo "oh oh"
 
 
-#### Target ######
-target=$(datadir)/modules/boolean
-
+modulename=boolean
 
 #### boolean : Conf files ####
-libsciboolean_la_rootdir = $(target)
+libsciboolean_la_rootdir = $(mydatadir)
 libsciboolean_la_root_DATA = changelog.txt licence.txt readme.txt VERSION.xml
 
 
 #### boolean : init scripts #### 
-libsciboolean_la_etcdir = $(target)/etc
+libsciboolean_la_etcdir = $(mydatadir)/etc
 libsciboolean_la_etc_DATA = etc/boolean.quit etc/boolean.start
 
 #### boolean : gateway declaration #### 
-libsciboolean_la_sci_gatewaydir = $(target)/sci_gateway
+libsciboolean_la_sci_gatewaydir = $(mydatadir)/sci_gateway
 libsciboolean_la_sci_gateway_DATA = sci_gateway/boolean_gateway.xml
 
 #### boolean : include files ####
-libsciboolean_la_includedir=$(sciincludedir)/boolean
+libsciboolean_la_includedir=$(pkgincludedir)/boolean
 libsciboolean_la_include_HEADERS = includes/gw_boolean.h
 
 include $(top_srcdir)/Makefile.incl.am
index a3e8cb1..f50dd53 100644 (file)
@@ -234,23 +234,23 @@ libscicacsd_la_LIBADD = \
 
 
 #### Target ######
-target=$(datadir)/modules/cacsd
+modulename=cacsd
 
 
 #### cacsd : Conf files ####
-libscicacsd_la_rootdir = $(target)
+libscicacsd_la_rootdir = $(mydatadir)
 libscicacsd_la_root_DATA = changelog.txt licence.txt readme.txt VERSION.xml
 
 #### cacsd : init scripts #### 
-libscicacsd_la_etcdir = $(target)/etc
+libscicacsd_la_etcdir = $(mydatadir)/etc
 libscicacsd_la_etc_DATA = etc/cacsd.quit etc/cacsd.start
 
 #### cacsd : gateway declaration ####
-libscicacsd_la_sci_gatewaydir = $(target)/sci_gateway
+libscicacsd_la_sci_gatewaydir = $(mydatadir)/sci_gateway
 libscicacsd_la_sci_gateway_DATA = sci_gateway/cacsd_gateway.xml
 
 #### cacsd : include files ####
-libscicacsd_la_includedir=$(sciincludedir)/cacsd
+libscicacsd_la_includedir=$(pkgincludedir)/cacsd
 libscicacsd_la_include_HEADERS = includes/gw_cacsd0.h \
 includes/gw_cacsd1.h \
 includes/gw_cacsd2.h \
@@ -258,7 +258,7 @@ includes/gw_cacsd3.h
 
 
 #### cacsd : demos files ####
-libscicacsd_la_demosdir=$(target)
+libscicacsd_la_demosdir=$(mydatadir)
 nobase_libscicacsd_la_demos_DATA = demos/tracking/track.dem \
 demos/lqg/lqg.dem \
 demos/lqg/scheme.dem \
index 5fd0d0e..e8741e3 100644 (file)
@@ -5,16 +5,16 @@
 
 
 #### Target ######
-target=$(datadir)/modules/compatibility_functions
+modulename=compatibility_functions
 
 
 #### compatibility_functions : Conf files ####
-libscicompatibility_functions_la_rootdir = $(target)
+libscicompatibility_functions_la_rootdir = $(mydatadir)
 libscicompatibility_functions_la_root_DATA = changelog.txt licence.txt readme.txt VERSION.xml
 
 
 #### compatibility_functions : init scripts #### 
-libscicompatibility_functions_la_etcdir = $(target)/etc
+libscicompatibility_functions_la_etcdir = $(mydatadir)/etc
 libscicompatibility_functions_la_etc_DATA = etc/compatibility_functions.quit etc/compatibility_functions.start
 
 include $(top_srcdir)/Makefile.incl.am
index 618ca15..8dbb73a 100644 (file)
@@ -342,24 +342,24 @@ endif
 
 
 #### Target ######
-target=$(datadir)/modules/core
+modulename=core
 
 #### core : Conf files ####
-libscicore_la_rootdir = $(target)
+libscicore_la_rootdir = $(mydatadir)
 libscicore_la_root_DATA = changelog.txt licence.txt readme.txt VERSION.xml
 
 
 #### core : init scripts #### 
-libscicore_la_etcdir = $(target)/etc
+libscicore_la_etcdir = $(mydatadir)/etc
 libscicore_la_etc_DATA = etc/core.quit etc/core.start
 
 #### core : gateway declaration #### 
-libscicore_la_sci_gatewaydir = $(target)/sci_gateway
+libscicore_la_sci_gatewaydir = $(mydatadir)/sci_gateway
 libscicore_la_sci_gateway_DATA = sci_gateway/core_gateway.xml
 
 
 #### core : include files ####
-libscicore_la_includedir=$(sciincludedir)/core
+libscicore_la_includedir=$(pkgincludedir)/core
 libscicore_la_include_HEADERS = includes/GetExceptionCode.h \
 includes/CallScilab.h \
 includes/sciprint.h \
@@ -404,7 +404,7 @@ includes/error_scilab.h \
 includes/GetXmlFileEncoding.h
 
 #### core : demos files ####
-libscicore_la_demosintrodir=$(target)/demos/intro/
+libscicore_la_demosintrodir=$(mydatadir)/demos/intro/
 libscicore_la_demosintro_DATA = demos/intro/extf.sce \
 demos/intro/Makefile.mak \
 demos/intro/MakeC.mak \
index d94049d..17a0325 100644 (file)
@@ -62,26 +62,26 @@ libscidata_structures_la_LIBADD = \
 
 
 #### Target ######
-target=$(datadir)/modules/data_structures
+modulename=data_structures
 
 
 #### data_structures : Conf files ####
-libscidata_structures_la_rootdir = $(target)
+libscidata_structures_la_rootdir = $(mydatadir)
 libscidata_structures_la_root_DATA = changelog.txt licence.txt readme.txt VERSION.xml
 
 
 #### data_structures : init scripts #### 
-libscidata_structures_la_etcdir = $(target)/etc
+libscidata_structures_la_etcdir = $(mydatadir)/etc
 libscidata_structures_la_etc_DATA = etc/data_structures.quit etc/data_structures.start
 
 #### data_structures : gateway declaration #### 
-libscidata_structures_la_sci_gatewaydir = $(target)/sci_gateway
+libscidata_structures_la_sci_gatewaydir = $(mydatadir)/sci_gateway
 libscidata_structures_la_sci_gateway_DATA = sci_gateway/data_structures_gateway.xml
 
 
 
 #### data_structures : include files ####
-libscidata_structures_la_includedir=$(sciincludedir)/data_structures
+libscidata_structures_la_includedir=$(pkgincludedir)/data_structures
 libscidata_structures_la_include_HEADERS = includes/gw_data_structures1.h \
 includes/gw_data_structures2.h \
 includes/DoublyLinkedList.h
index bcd0166..c65addd 100644 (file)
@@ -6,14 +6,14 @@
 
 
 #### Target ######
-target=$(datadir)/modules/development_tools
+modulename=development_tools
 
 
 #### development_tools : Conf files ####
-libdevelopment_tools_la_rootdir = $(target)
+libdevelopment_tools_la_rootdir = $(mydatadir)
 libdevelopment_tools_la_root_DATA = changelog.txt licence.txt readme.txt VERSION.xml
 #### development_tools : init scripts #### 
-libdevelopment_tools_la_etcdir = $(target)/etc
+libdevelopment_tools_la_etcdir = $(mydatadir)/etc
 libdevelopment_tools_la_etc_DATA = etc/development_tools.quit etc/development_tools.start
 
 include $(top_srcdir)/Makefile.incl.am
index 4140652..f09264c 100644 (file)
@@ -138,19 +138,19 @@ libscidifferential_equations_la_LIBADD = \
 
 
 #### Target ######
-target=$(datadir)/modules/differential_equations
+modulename=differential_equations
 
 
 #### differential_equations : Conf files ####
-libscidifferential_equations_la_rootdir = $(target)
+libscidifferential_equations_la_rootdir = $(mydatadir)
 libscidifferential_equations_la_root_DATA = changelog.txt licence.txt readme.txt VERSION.xml
 
 #### differential_equations : init scripts #### 
-libscidifferential_equations_la_etcdir = $(target)/etc
+libscidifferential_equations_la_etcdir = $(mydatadir)/etc
 libscidifferential_equations_la_etc_DATA = etc/differential_equations.quit etc/differential_equations.start
 
 #### differential_equations : gateway declaration #### 
-libscidifferential_equations_la_sci_gatewaydir = $(target)/sci_gateway
+libscidifferential_equations_la_sci_gatewaydir = $(mydatadir)/sci_gateway
 libscidifferential_equations_la_sci_gateway_DATA = sci_gateway/differential_equations_gateway.xml
 
 include $(top_srcdir)/Makefile.incl.am
index 7f2f73b..c048566 100644 (file)
@@ -38,16 +38,16 @@ libscidouble_la_LIBADD = \
 
 
 #### Target ######
-target=$(datadir)/modules/double
+modulename=double
 
 
 #### double : Conf files ####
-libscidouble_la_rootdir = $(target)
+libscidouble_la_rootdir = $(mydatadir)
 libscidouble_la_root_DATA = changelog.txt licence.txt readme.txt VERSION.xml
 
 
 #### double : init scripts #### 
-libscidouble_la_etcdir = $(target)/etc
+libscidouble_la_etcdir = $(mydatadir)/etc
 libscidouble_la_etc_DATA = etc/double.quit etc/double.start
 
 include $(top_srcdir)/Makefile.incl.am
index 463f015..7a43b2c 100644 (file)
@@ -388,26 +388,26 @@ libdummy_elementaries_functions_la-icopy.lo: src/fortran/icopy.f
 
 
 #### Target ######
-target=$(datadir)/modules/elementaries_functions
+modulename=elementaries_functions
 
 
 #### elementaries_functions : Conf files ####
-libscielementaries_functions_la_rootdir = $(target)
+libscielementaries_functions_la_rootdir = $(mydatadir)
 libscielementaries_functions_la_root_DATA = changelog.txt licence.txt readme.txt VERSION.xml
 
 
 
 #### elementaries_functions : init scripts #### 
-libscielementaries_functions_la_etcdir = $(target)/etc
+libscielementaries_functions_la_etcdir = $(mydatadir)/etc
 libscielementaries_functions_la_etc_DATA = etc/elementaries_functions.quit etc/elementaries_functions.start
 
 #### elementaries_functions : gateway declaration #### 
-libscielementaries_functions_la_sci_gatewaydir = $(target)/sci_gateway
+libscielementaries_functions_la_sci_gatewaydir = $(mydatadir)/sci_gateway
 libscielementaries_functions_la_sci_gateway_DATA = sci_gateway/elementaries_functions_gateway.xml
 
 
 #### elementaries_functions : include files ####
-libscielementaries_functions_la_includedir=$(sciincludedir)/elementaries_functions
+libscielementaries_functions_la_includedir=$(pkgincludedir)/elementaries_functions
 libscielementaries_functions_la_include_HEADERS = includes/sci_tools.h \
 includes/gw_elementaries_functions.h \
 includes/elementaries_functions.h
index e03ffa1..a6ec274 100644 (file)
@@ -7,7 +7,7 @@
 if FFTW
 
 #### Target ######
-target=$(datadir)/modules/fftw
+modulename=fftw
 
 pkglib_LTLIBRARIES = libscifftw.la
 
@@ -27,15 +27,15 @@ GATEWAY_C_SOURCES = sci_gateway/c/gw_fftw.c \
 
 
 #### fftw : Conf files ####
-libscifftw_la_rootdir = $(target)
+libscifftw_la_rootdir = $(mydatadir)
 libscifftw_la_root_DATA = changelog.txt licence.txt readme.txt VERSION.xml
 
 #### fftw : init scripts #### 
-libscifftw_la_etcdir = $(target)/etc
+libscifftw_la_etcdir = $(mydatadir)/etc
 libscifftw_la_etc_DATA = etc/fftw.quit etc/fftw.start
 
 #### fftw : gateway declaration #### 
-libscifftw_la_sci_gatewaydir = $(target)/sci_gateway
+libscifftw_la_sci_gatewaydir = $(mydatadir)/sci_gateway
 libscifftw_la_sci_gateway_DATA = sci_gateway/fftw_gateway.xml
 
 libscifftw_la_SOURCES = $(FFTW_C_SOURCES) $(GATEWAY_C_SOURCES)
@@ -45,7 +45,7 @@ libscifftw_la_CFLAGS=  -Iincludes/  -Isrc/c/
 libscifftw_la_LDFLAGS = $(FFTW3_LIB)
 
 #### fftw : include files ####
-libscifftw_la_includedir=$(sciincludedir)/fftw
+libscifftw_la_includedir=$(pkgincludedir)/fftw
 libscifftw_la_include_HEADERS = includes/sci_loadfftwlibrary.h \
 includes/sci_fftwlibraryisloaded.h \
 includes/sci_disposefftwlibrary.h \
index e3f2e72..2928da6 100644 (file)
@@ -74,31 +74,31 @@ libscifileio_la_LIBADD = \
 
 
 #### Target ######
-target=$(datadir)/modules/fileio
+modulename=fileio
 
 
 #### fileio : Conf files ####
-libscifileio_la_rootdir = $(target)
+libscifileio_la_rootdir = $(mydatadir)
 libscifileio_la_root_DATA = changelog.txt licence.txt readme.txt VERSION.xml
 
 
 #### fileio : init scripts #### 
-libscifileio_la_etcdir = $(target)/etc
+libscifileio_la_etcdir = $(mydatadir)/etc
 libscifileio_la_etc_DATA = etc/fileio.quit etc/fileio.start
 
 #### fileio : gateway declaration #### 
-libscifileio_la_sci_gatewaydir = $(target)/sci_gateway
+libscifileio_la_sci_gatewaydir = $(mydatadir)/sci_gateway
 libscifileio_la_sci_gateway_DATA = sci_gateway/fileio_gateway.xml
 
 #### fileio : include files ####
-libscifileio_la_includedir=$(sciincludedir)/fileio
+libscifileio_la_includedir=$(pkgincludedir)/fileio
 libscifileio_la_include_HEADERS = includes/FileExist.h \
 includes/gw_fileio.h \
 includes/sci_fileio.h
 
 
 #### fileio : demos files ####
-libscifileio_la_demosdir=$(target)
+libscifileio_la_demosdir=$(mydatadir)
 nobase_libscifileio_la_demos_DATA = demos/excel/Testo1.xls \
 demos/excel/o1.xls \
 demos/excel/Test1.xls \
index 441e044..c635df8 100644 (file)
@@ -5,17 +5,17 @@
 
 
 #### Target ######
-target=$(datadir)/modules/functions
+modulename=functions
 
 
 #### functions : Conf files ####
-libscifunctions_la_rootdir = $(target)
+libscifunctions_la_rootdir = $(mydatadir)
 libscifunctions_la_root_DATA = changelog.txt licence.txt readme.txt VERSION.xml
 
 
 
 #### functions : init scripts #### 
-libscifunctions_la_etcdir = $(target)/etc
+libscifunctions_la_etcdir = $(mydatadir)/etc
 libscifunctions_la_etc_DATA = etc/functions.quit etc/functions.start
 
 include $(top_srcdir)/Makefile.incl.am
index 08aa924..655389c 100644 (file)
@@ -446,24 +446,24 @@ libscigraphics_la_LIBADD = \
 
 
 #### Target ######
-target=$(datadir)/modules/graphics
+modulename=graphics
 
 
 #### graphics : Conf files ####
-libscigraphics_la_rootdir = $(target)
+libscigraphics_la_rootdir = $(mydatadir)
 libscigraphics_la_root_DATA = changelog.txt licence.txt readme.txt VERSION.xml
 
 
 #### graphics : init scripts #### 
-libscigraphics_la_etcdir = $(target)/etc
+libscigraphics_la_etcdir = $(mydatadir)/etc
 libscigraphics_la_etc_DATA = etc/graphics.quit etc/graphics.start
 
 #### graphics : gateway declaration #### 
-libscigraphics_la_sci_gatewaydir = $(target)/sci_gateway
+libscigraphics_la_sci_gatewaydir = $(mydatadir)/sci_gateway
 libscigraphics_la_sci_gateway_DATA = sci_gateway/graphics_gateway.xml
 
 #### graphics : include files ####
-libscigraphics_la_includedir=$(sciincludedir)/graphics
+libscigraphics_la_includedir=$(pkgincludedir)/graphics
 libscigraphics_la_include_HEADERS = includes/sci_xdel.h \
 includes/sci_winsid.h \
 includes/sci_addcb.h \
@@ -601,7 +601,7 @@ includes/ObjectSelection.h
 
 
 #### graphics : demos files ####
-libscigraphics_la_demosdir=$(target)
+libscigraphics_la_demosdir=$(mydatadir)
 nobase_libscigraphics_la_demos_DATA = demos/anim/anim7.dem \
 demos/anim/anim8.dem \
 demos/anim/~anim6.sci \
index bc76613..d361f1b 100644 (file)
@@ -124,25 +124,25 @@ libscigui_la_LIBADD = \
 
 
 #### Target ######
-target=$(datadir)/modules/gui
+modulename=gui
 
 
 #### gui : Conf files ####
-libscigui_la_rootdir = $(target)
+libscigui_la_rootdir = $(mydatadir)
 libscigui_la_root_DATA = changelog.txt licence.txt readme.txt VERSION.xml
 
 
 #### gui : init scripts #### 
-libscigui_la_etcdir = $(target)/etc
+libscigui_la_etcdir = $(mydatadir)/etc
 libscigui_la_etc_DATA = etc/gui.quit etc/gui.start
 
 #### gui : gateway declaration #### 
-libscigui_la_sci_gatewaydir = $(target)/sci_gateway
+libscigui_la_sci_gatewaydir = $(mydatadir)/sci_gateway
 libscigui_la_sci_gateway_DATA = sci_gateway/gui_gateway.xml
 
 
 #### gui : include files ####
-libscigui_la_includedir=$(sciincludedir)/gui
+libscigui_la_includedir=$(pkgincludedir)/gui
 libscigui_la_include_HEADERS = includes/men_choice.h \
 includes/sci_tohome.h \
 includes/men_scilab.h \
@@ -154,7 +154,7 @@ includes/GraphicWindow.h
 
 
 #### gui : demos files ####
-libscigui_la_demosdir=$(target)/demos/
+libscigui_la_demosdir=$(mydatadir)/demos/
 libscigui_la_demos_DATA = demos/dialog.dem
 
 
index 998a9bc..3f3e40c 100644 (file)
@@ -5,15 +5,15 @@
 
 
 #### Target ######
-target=$(datadir)/modules/helptools
+modulename=helptools
 
 
 #### helptools : Conf files ####
-libscihelptools_la_rootdir = $(target)
+libscihelptools_la_rootdir = $(mydatadir)
 libscihelptools_la_root_DATA = changelog.txt licence.txt readme.txt VERSION.xml
 
 #### helptools : init scripts #### 
-libscihelptools_la_etcdir = $(target)/etc
+libscihelptools_la_etcdir = $(mydatadir)/etc
 libscihelptools_la_etc_DATA = etc/helptools.quit etc/helptools.start
 
 include $(top_srcdir)/Makefile.incl.am
index 8cbff10..6b00c3d 100644 (file)
@@ -5,19 +5,19 @@
 
 
 #### Target ######
-target=$(datadir)/modules/incremental_link
+modulename=incremental_link
 
 
 #### incremental_link : Conf files ####
-libincremental_link_la_rootdir = $(target)
+libincremental_link_la_rootdir = $(mydatadir)
 libincremental_link_la_root_DATA = changelog.txt licence.txt readme.txt VERSION.xml
 
 #### incremental_link : init scripts #### 
-libincremental_link_la_etcdir = $(target)/etc
+libincremental_link_la_etcdir = $(mydatadir)/etc
 libincremental_link_la_etc_DATA = etc/incremental_link.quit etc/incremental_link.start
 
 #### incremental_link : compilation scripts #### 
-libincremental_link_la_scriptdir = $(target)/src/scripts/
+libincremental_link_la_scriptdir = $(mydatadir)/src/scripts/
 libincremental_link_la_script_DATA = src/scripts/Makefile.in \
 src/scripts/configure.ac \
 src/scripts/ltmain.sh \
index 4597a64..3f30a5a 100644 (file)
@@ -8,7 +8,7 @@ pkglib_LTLIBRARIES = libsciexternal.la
 
 # Fake sources in order to make believe to the autotool that we are going
 # to compile some C/C++, fortran sources.
-# Thanks to this, automake will generate compilation targets for 
+# Thanks to this, automake will generate compilation mydatadirs for 
 # these 3 languages.
 # Don't change name or order 
 libsciexternal_la_SOURCES = foo.c foo2.f foo3.cxx
index e529931..c55274a 100644 (file)
@@ -131,24 +131,24 @@ libsciinteger_la_LIBADD = \
 
 
 #### Target ######
-target=$(datadir)/modules/integer
+modulename=integer
 
 
 #### integer : Conf files ####
-libsciinteger_la_rootdir = $(target)
+libsciinteger_la_rootdir = $(mydatadir)
 libsciinteger_la_root_DATA = changelog.txt licence.txt readme.txt VERSION.xml
 
 
 #### integer : init scripts #### 
-libsciinteger_la_etcdir = $(target)/etc
+libsciinteger_la_etcdir = $(mydatadir)/etc
 libsciinteger_la_etc_DATA = etc/integer.quit etc/integer.start
 
 #### integer : gateway declaration #### 
-libsciinteger_la_sci_gatewaydir = $(target)/sci_gateway
+libsciinteger_la_sci_gatewaydir = $(mydatadir)/sci_gateway
 libsciinteger_la_sci_gateway_DATA = sci_gateway/integer_gateway.xml
 
 #### integer : include files ####
-libsciinteger_la_includedir=$(sciincludedir)/integer
+libsciinteger_la_includedir=$(pkgincludedir)/integer
 libsciinteger_la_include_HEADERS = includes/gw_integer.h \
 includes/def.h
 
index 346deea..b165ccb 100644 (file)
@@ -40,31 +40,31 @@ libsciinterpolation_la_LIBADD = \
 
 
 #### Target ######
-target=$(datadir)/modules/interpolation
+modulename=interpolation
 
 
 #### interpolation : Conf files ####
-libsciinterpolation_la_rootdir = $(target)
+libsciinterpolation_la_rootdir = $(mydatadir)
 libsciinterpolation_la_root_DATA = changelog.txt licence.txt readme.txt VERSION.xml
 
 
 #### interpolation : init scripts #### 
-libsciinterpolation_la_etcdir = $(target)/etc
+libsciinterpolation_la_etcdir = $(mydatadir)/etc
 libsciinterpolation_la_etc_DATA = etc/interpolation.quit etc/interpolation.start
 
 #### interpolation : gateway declaration #### 
-libsciinterpolation_la_sci_gatewaydir = $(target)/sci_gateway
+libsciinterpolation_la_sci_gatewaydir = $(mydatadir)/sci_gateway
 libsciinterpolation_la_sci_gateway_DATA = sci_gateway/interpolation_gateway.xml
 
 #### interpolation : include files ####
-libsciinterpolation_la_includedir=$(sciincludedir)/interpolation
+libsciinterpolation_la_includedir=$(pkgincludedir)/interpolation
 libsciinterpolation_la_include_HEADERS = includes/gw_interpolation.h \
 includes/interpolation.h \
 includes/constinterp.h
 
 
 #### interpolation : demos files ####
-libsciinterpolation_la_demosdir=$(target)/demos/
+libsciinterpolation_la_demosdir=$(mydatadir)/demos/
 libsciinterpolation_la_demos_DATA = demos/interp_demo.sci
 
 include $(top_srcdir)/Makefile.incl.am
index 15adba5..d1dec67 100644 (file)
@@ -22,7 +22,7 @@ src/exe/declare.c \
 src/exe/opt.c \
 src/exe/check.c
 
-libsciintersci_la_includedir=$(sciincludedir)/intersci
+libsciintersci_la_includedir=$(pkgincludedir)/intersci
 
 
 pkglib_LTLIBRARIES = libsciintersci.la
@@ -38,16 +38,16 @@ libsciintersci_la_LIBADD = \
        $(top_builddir)/libs/MALLOC/libscimalloc.la
 
 #### Target ######
-target=$(datadir)/modules/intersci
+modulename=intersci
 
 
 #### intersci : Conf files ####
-libsciintersci_la_rootdir = $(target)
+libsciintersci_la_rootdir = $(mydatadir)
 libsciintersci_la_root_DATA = changelog.txt licence.txt readme.txt VERSION.xml
 
 
 #### intersci : init scripts #### 
-libsciintersci_la_etcdir = $(target)/etc
+libsciintersci_la_etcdir = $(mydatadir)/etc
 libsciintersci_la_etc_DATA = etc/intersci.quit etc/intersci.start
 
 include $(top_srcdir)/Makefile.incl.am
index 62bb0ed..63d1e47 100644 (file)
@@ -97,24 +97,24 @@ libdummy_io_la-intmgetl.lo: sci_gateway/fortran/intmgetl.f
 
 
 #### Target ######
-target=$(datadir)/modules/io
+modulename=io
 
 
 #### io : Conf files ####
-libsciio_la_rootdir = $(target)
+libsciio_la_rootdir = $(mydatadir)
 libsciio_la_root_DATA = changelog.txt licence.txt readme.txt VERSION.xml
 
 
 #### io : init scripts #### 
-libsciio_la_etcdir = $(target)/etc
+libsciio_la_etcdir = $(mydatadir)/etc
 libsciio_la_etc_DATA = etc/io.quit etc/io.start
 
 #### io : gateway declaration #### 
-libsciio_la_sci_gatewaydir = $(target)/sci_gateway
+libsciio_la_sci_gatewaydir = $(mydatadir)/sci_gateway
 libsciio_la_sci_gateway_DATA = sci_gateway/io_gateway.xml
 
 #### io : include files ####
-libsciio_la_includedir=$(sciincludedir)/io
+libsciio_la_includedir=$(pkgincludedir)/io
 libsciio_la_include_HEADERS = includes/sci_getrelativefilename.h \
 includes/gw_io.h
 
index 624205a..5ecdf15 100644 (file)
@@ -6,7 +6,7 @@
 include $(top_srcdir)/Makefile.incl.am
 
 #### Target ######
-target=$(datadir)/modules/javasci
+modulename=javasci
 
 #### Java sources ####
 JAVAFILES = src/java/javasci/Scilab.java \
@@ -52,16 +52,16 @@ libjavasci_la_LIBADD = \
        $(top_builddir)/modules/libscilab.la
 
 #### javasci : Conf files ####
-libjavasci_la_rootdir = $(target)
+libjavasci_la_rootdir = $(mydatadir)
 libjavasci_la_root_DATA = changelog.txt licence.txt readme.txt VERSION.xml
 
 #### javasci : init scripts #### 
-libjavasci_la_etcdir = $(target)/etc
+libjavasci_la_etcdir = $(mydatadir)/etc
 libjavasci_la_etc_DATA = etc/javasci.quit etc/javasci.start
 
 
 #### javasci : include files ####
-libjavasci_la_includedir=$(sciincludedir)/javasci
+libjavasci_la_includedir=$(pkgincludedir)/javasci
 libjavasci_la_include_HEADERS = includes/javasci_Scilab.h \
 includes/javasci_Scilab2.h \
 includes/javasci_globals.h \
index 762f72b..f17cb93 100644 (file)
@@ -25,16 +25,16 @@ $(top_builddir)/modules/gui/libscigui.la
 
 
 #### Target ######
-target=$(datadir)/modules/jvm
+modulename=jvm
 
 
 #### jvm : Conf files ####
-libscijvm_la_rootdir = $(target)
+libscijvm_la_rootdir = $(mydatadir)
 libscijvm_la_root_DATA = changelog.txt licence.txt readme.txt VERSION.xml
 
 
 #### jvm : init scripts #### 
-libscijvm_la_etcdir = $(target)/etc
+libscijvm_la_etcdir = $(mydatadir)/etc
 libscijvm_la_etc_DATA = etc/jvm.quit etc/jvm.start
 
 include $(top_srcdir)/Makefile.incl.am
index af46be6..9a2992c 100644 (file)
@@ -99,24 +99,24 @@ $(top_builddir)/libs/blas/libsciblas.la \
 $(top_builddir)/modules/elementaries_functions/libscielementaries_functions.la  
 
 #### Target ######
-target=$(datadir)/modules/linear_algebra
+modulename=linear_algebra
 
 
 #### linear_algebra : Conf files ####
-libscilinear_algebra_la_rootdir = $(target)
+libscilinear_algebra_la_rootdir = $(mydatadir)
 libscilinear_algebra_la_root_DATA = changelog.txt licence.txt readme.txt VERSION.xml
 
 
 #### linear_algebra : init scripts #### 
-libscilinear_algebra_la_etcdir = $(target)/etc
+libscilinear_algebra_la_etcdir = $(mydatadir)/etc
 libscilinear_algebra_la_etc_DATA = etc/linear_algebra.quit etc/linear_algebra.start
 #### linear_algebra : gateway declaration #### 
-libscilinear_algebra_la_sci_gatewaydir = $(target)/sci_gateway
+libscilinear_algebra_la_sci_gatewaydir = $(mydatadir)/sci_gateway
 libscilinear_algebra_la_sci_gateway_DATA = sci_gateway/linear_algebra_gateway.xml
 
 
 #### linear_algebra : include files ####
-libscilinear_algebra_la_includedir=$(sciincludedir)/linear_algebra
+libscilinear_algebra_la_includedir=$(pkgincludedir)/linear_algebra
 libscilinear_algebra_la_include_HEADERS = includes/gw_linear_algebra.h \
 includes/gw_linear_algebra2.h
 
index cadf676..abb199e 100644 (file)
@@ -34,24 +34,24 @@ libscilocalization_la_LIBADD =      $(top_builddir)/libs/MALLOC/libscimalloc.la \
 $(top_builddir)/libs/hashtable/libscihashtable.la
 
 #### Target ######
-target=$(datadir)/modules/localization
+modulename=localization
 
 #### localization : Conf files ####
-libscilocalization_la_rootdir = $(target)
+libscilocalization_la_rootdir = $(mydatadir)
 libscilocalization_la_root_DATA = changelog.txt licence.txt readme.txt VERSION.xml
 
 
 ####localization : init scripts #### 
-libscilocalization_la_etcdir = $(target)/etc
+libscilocalization_la_etcdir = $(mydatadir)/etc
 libscilocalization_la_etc_DATA = etc/localization.quit etc/localization.start
 
 #### localization : gateway declaration #### 
-libscilocalization_la_sci_gatewaydir = $(target)/sci_gateway
+libscilocalization_la_sci_gatewaydir = $(mydatadir)/sci_gateway
 libscilocalization_la_sci_gateway_DATA = sci_gateway/localization_gateway.xml
 
 
 ####localization : include files ####
-libscilocalization_la_includedir=$(sciincludedir)/localization
+libscilocalization_la_includedir=$(pkgincludedir)/localization
 libscilocalization_la_include_HEADERS = includes/localization.h \
 includes/gw_localization.h
 
index ea6a50c..fc5b1cd 100644 (file)
@@ -5,11 +5,11 @@
 
 
 #### Target ######
-target=$(datadir)/modules/m2sci
+modulename=m2sci
 
 
 #### m2sci : Conf files ####
-libm2sci_la_rootdir = $(target)
+libm2sci_la_rootdir = $(mydatadir)
 libm2sci_la_root_DATA = changelog.txt licence.txt readme.txt VERSION.xml
 
 #### m2sci : Macros ####
@@ -18,7 +18,7 @@ macros/m2sci/percent/ \
 macros/m2sci/sci_files/
 
 #### m2sci : init scripts #### 
-libm2sci_la_etcdir = $(target)/etc
+libm2sci_la_etcdir = $(mydatadir)/etc
 libm2sci_la_etc_DATA = etc/m2sci.quit etc/m2sci.start
 
 include $(top_srcdir)/Makefile.incl.am
index 8f10c33..9273043 100644 (file)
@@ -5,16 +5,16 @@
 
 
 #### Target ######
-target=$(datadir)/modules/maple2scilab
+modulename=maple2scilab
 
 
 #### maple2scilab : Conf files ####
-libmaple2scilab_la_rootdir = $(target)
+libmaple2scilab_la_rootdir = $(mydatadir)
 libmaple2scilab_la_root_DATA = changelog.txt licence.txt readme.txt VERSION.xml
 
 
 #### maple2scilab : init scripts #### 
-libmaple2scilab_la_etcdir = $(target)/etc
+libmaple2scilab_la_etcdir = $(mydatadir)/etc
 libmaple2scilab_la_etc_DATA = etc/maple2scilab.quit etc/maple2scilab.start
 
 include $(top_srcdir)/Makefile.incl.am
index 34c27db..837c42e 100644 (file)
@@ -134,29 +134,29 @@ libscimetanet_la_LIBADD = \
 
 
 #### Target ######
-target=$(datadir)/modules/metanet
+modulename=metanet
 
 
 #### metanet : Conf files ####
-libscimetanet_la_rootdir = $(target)
+libscimetanet_la_rootdir = $(mydatadir)
 libscimetanet_la_root_DATA = changelog.txt licence.txt readme.txt VERSION.xml
 
 
 #### metanet : init scripts #### 
-libscimetanet_la_etcdir = $(target)/etc
+libscimetanet_la_etcdir = $(mydatadir)/etc
 libscimetanet_la_etc_DATA = etc/metanet.quit etc/metanet.start
 
 #### metanet : gateway declaration #### 
-libscimetanet_la_sci_gatewaydir = $(target)/sci_gateway
+libscimetanet_la_sci_gatewaydir = $(mydatadir)/sci_gateway
 libscimetanet_la_sci_gateway_DATA = sci_gateway/metanet_gateway.xml
 
 #### metanet : include files ####
-libscimetanet_la_includedir=$(sciincludedir)/metanet
+libscimetanet_la_includedir=$(pkgincludedir)/metanet
 libscimetanet_la_include_HEADERS = includes/gw_metanet.h
 
 
 #### metanet : demos files ####
-libscimetanet_la_demosdir=$(target)/demos/
+libscimetanet_la_demosdir=$(mydatadir)/demos/
 libscimetanet_la_demos_DATA = demos/foret.graph \
 demos/toto.graph \
 demos/colored.graph \
index ee706ba..f32871a 100644 (file)
@@ -35,20 +35,20 @@ libmx_la_CFLAGS=  $(MEXLIB_FLAGS)
 
 
 #### Target ######
-target=$(datadir)/modules/mexlib
+modulename=mexlib
 
 
 #### mexlib : Conf files ####
-libmex_la_rootdir = $(target)
+libmex_la_rootdir = $(mydatadir)
 libmex_la_root_DATA = changelog.txt licence.txt readme.txt VERSION.xml
 
 #### mexlib : init scripts #### 
-libmex_la_etcdir = $(target)/etc
+libmex_la_etcdir = $(mydatadir)/etc
 libmex_la_etc_DATA = etc/mexlib.quit etc/mexlib.start
 
 
 #### mexlib : include files ####
-libmex_la_includedir=$(sciincludedir)/mexlib
+libmex_la_includedir=$(pkgincludedir)/mexlib
 libmex_la_include_HEADERS = includes/mex.h
 
 include $(top_srcdir)/Makefile.incl.am
index cea6212..4f09b0e 100644 (file)
@@ -153,29 +153,29 @@ libscioptimization_la_LIBADD = \
 
 
 #### Target ######
-target=$(datadir)/modules/optimization
+modulename=optimization
 
 
 #### optimization : Conf files ####
-libscioptimization_la_rootdir = $(target)
+libscioptimization_la_rootdir = $(mydatadir)
 libscioptimization_la_root_DATA = changelog.txt licence.txt readme.txt VERSION.xml
 
 
 #### optimization : init scripts #### 
-libscioptimization_la_etcdir = $(target)/etc
+libscioptimization_la_etcdir = $(mydatadir)/etc
 libscioptimization_la_etc_DATA = etc/optimization.quit etc/optimization.start
 
 #### optimization : gateway declaration #### 
-libscioptimization_la_sci_gatewaydir = $(target)/sci_gateway
+libscioptimization_la_sci_gatewaydir = $(mydatadir)/sci_gateway
 libscioptimization_la_sci_gateway_DATA = sci_gateway/optimization_gateway.xml
 #### optimization : include files ####
-libscioptimization_la_includedir=$(sciincludedir)/optimization
+libscioptimization_la_includedir=$(pkgincludedir)/optimization
 libscioptimization_la_include_HEADERS = includes/gw_optim.h \
 includes/spd.h
 
 
 #### optimization : demos files ####
-libscioptimization_la_demosdir=$(target)
+libscioptimization_la_demosdir=$(mydatadir)
 nobase_libscioptimization_la_demos_DATA = demos/lmitool/normoptd.sci \
 demos/lmitool/dscr_lyap2.sci \
 demos/lmitool/fullstate.sci \
index 8ef8cf4..1bb4a4f 100644 (file)
@@ -5,21 +5,21 @@
 
 
 #### Target ######
-target=$(datadir)/modules/others
+modulename=others
 
 
 #### others : Conf files ####
-libsciothers_la_rootdir = $(target)
+libsciothers_la_rootdir = $(mydatadir)
 libsciothers_la_root_DATA = changelog.txt licence.txt readme.txt VERSION.xml
 
 
 #### others : init scripts #### 
-libsciothers_la_etcdir = $(target)/etc
+libsciothers_la_etcdir = $(mydatadir)/etc
 libsciothers_la_etc_DATA = etc/others.quit etc/others.start
 
 
 #### others : demos files - velpic ####
-libsciothers_la_demosdir=$(target)
+libsciothers_la_demosdir=$(mydatadir)
 nobase_libsciothers_la_demos_DATA = demos/velpic/id_rgn.desc \
 demos/velpic/velpic.sci \
 demos/velpic/plotdb.sci \
index 6a9f217..c2a3344 100644 (file)
@@ -5,17 +5,17 @@
 
 
 #### Target ######
-target=$(datadir)/modules/overloading
+modulename=overloading
 
 
 #### overloading : Conf files ####
-libscioverloading_la_rootdir = $(target)
+libscioverloading_la_rootdir = $(mydatadir)
 libscioverloading_la_root_DATA = changelog.txt licence.txt readme.txt VERSION.xml
 
 
 
 #### overloading : init scripts #### 
-libscioverloading_la_etcdir = $(target)/etc
+libscioverloading_la_etcdir = $(mydatadir)/etc
 libscioverloading_la_etc_DATA = etc/overloading.quit etc/overloading.start
 
 include $(top_srcdir)/Makefile.incl.am
index 287487a..cde3b21 100644 (file)
@@ -120,26 +120,26 @@ libscipolynomials_la_LIBADD =
 
 
 #### Target ######
-target=$(datadir)/modules/polynomials
+modulename=polynomials
 
 
 #### polynomials : Conf files ####
-libscipolynomials_la_rootdir = $(target)
+libscipolynomials_la_rootdir = $(mydatadir)
 libscipolynomials_la_root_DATA = changelog.txt licence.txt readme.txt VERSION.xml
 
 
 #### polynomials : init scripts #### 
-libscipolynomials_la_etcdir = $(target)/etc
+libscipolynomials_la_etcdir = $(mydatadir)/etc
 libscipolynomials_la_etc_DATA = etc/polynomials.quit etc/polynomials.start
 
 #### polynomials : gateway declaration #### 
-libscipolynomials_la_sci_gatewaydir = $(target)/sci_gateway
+libscipolynomials_la_sci_gatewaydir = $(mydatadir)/sci_gateway
 libscipolynomials_la_sci_gateway_DATA = sci_gateway/polynomials_gateway.xml
 
 
 
 #### polynomials : include files ####
-libscipolynomials_la_includedir=$(sciincludedir)/polynomials
+libscipolynomials_la_includedir=$(pkgincludedir)/polynomials
 libscipolynomials_la_include_HEADERS = includes/gw_polynomials.h
 
 include $(top_srcdir)/Makefile.incl.am
index e9a47e2..920874f 100644 (file)
@@ -65,26 +65,26 @@ libscipvm_la_LDFLAGS = $(PVM_LIB)
 
 #
 #### Target ######
-target=$(datadir)/modules/pvm
+modulename=pvm
 
 #### pvm : Conf files ####
-libscipvm_la_rootdir = $(target)
+libscipvm_la_rootdir = $(mydatadir)
 libscipvm_la_root_DATA = changelog.txt licence.txt readme.txt VERSION.xml
 
 #### pvm : init scripts #### 
-libscipvm_la_etcdir = $(target)/etc
+libscipvm_la_etcdir = $(mydatadir)/etc
 libscipvm_la_etc_DATA = etc/pvm.quit etc/pvm.start
 
 #### pvm : gateway declaration #### 
-libscipvm_la_sci_gatewaydir = $(target)/sci_gateway
+libscipvm_la_sci_gatewaydir = $(mydatadir)/sci_gateway
 libscipvm_la_sci_gateway_DATA = sci_gateway/pvm_gateway.xml
 
 #### pvm : include files ####
-libscipvm_la_includedir=$(sciincludedir)/pvm
+libscipvm_la_includedir=$(pkgincludedir)/pvm
 libscipvm_la_include_HEADERS = includes/gw_pvm.h
 
 #### pvm : demos files ####
-libscipvm_la_demosdir=$(target)/demos/
+libscipvm_la_demosdir=$(mydatadir)/demos/
 libscipvm_la_demos_DATA = demos/pvm.dem \
 demos/pvm1.sce \
 demos/script.sce
index cbd863d..07d5f14 100644 (file)
@@ -57,31 +57,31 @@ libscirandlib_la_LIBADD = \
 
 
 #### Target ######
-target=$(datadir)/modules/randlib
+modulename=randlib
 
 
 #### randlib : Conf files ####
-libscirandlib_la_rootdir = $(target)
+libscirandlib_la_rootdir = $(mydatadir)
 libscirandlib_la_root_DATA = changelog.txt licence.txt readme.txt VERSION.xml
 
 
 #### randlib : init scripts #### 
-libscirandlib_la_etcdir = $(target)/etc
+libscirandlib_la_etcdir = $(mydatadir)/etc
 libscirandlib_la_etc_DATA = etc/randlib.quit etc/randlib.start
 
 #### randlib : gateway declaration #### 
-libscirandlib_la_sci_gatewaydir = $(target)/sci_gateway
+libscirandlib_la_sci_gatewaydir = $(mydatadir)/sci_gateway
 libscirandlib_la_sci_gateway_DATA = sci_gateway/randlib_gateway.xml
 
 #### randlib : include files ####
-libscirandlib_la_includedir=$(sciincludedir)/randlib
+libscirandlib_la_includedir=$(pkgincludedir)/randlib
 libscirandlib_la_include_HEADERS = includes/grand.h \
 includes/clcg4.h \
 includes/others_generators.h
 
 
 #### randlib : demos files ####
-libscirandlib_la_demosdir=$(target)/demos/
+libscirandlib_la_demosdir=$(mydatadir)/demos/
 libscirandlib_la_demos_DATA = demos/randomT.sci \
 demos/random.dem \
 demos/random.sci
index f3d860e..571fd6b 100644 (file)
@@ -1,20 +1,20 @@
 
 
 #### Target ######
-target=$(datadir)/modules/sci2c
+modulename=sci2c
 
 
 #### sci2c : Conf files ####
-libsci2c_la_rootdir = $(target)
+libsci2c_la_rootdir = $(mydatadir)
 libsci2c_la_root_DATA = changelog.txt licence.txt readme.txt VERSION.xml
 
 
 #### sci2c : init scripts #### 
-libsci2c_la_etcdir = $(target)/etc
+libsci2c_la_etcdir = $(mydatadir)/etc
 libsci2c_la_etc_DATA = etc/sci2c.quit etc/sci2c.start
 
 #### sci2c : gateway declaration #### 
-libsci2c_la_sci_gatewaydir = $(target)/sci_gateway
+libsci2c_la_sci_gatewaydir = $(mydatadir)/sci_gateway
 libsci2c_la_sci_gateway_DATA = sci_gateway/sci2c_gateway.xml
 
 
index 41c5df1..13e2cc5 100644 (file)
@@ -8,7 +8,7 @@
 pkglib_LTLIBRARIES = libsciscicos.la
 
 #### Target ######
-target=$(datadir)/modules/scicos
+modulename=scicos
 
 include $(top_srcdir)/Makefile.incl.am
 
@@ -233,21 +233,21 @@ libsciscicos_la_LIBADD = \
 
 
 #### scicos : Conf files ####
-libsciscicos_la_rootdir = $(target)
+libsciscicos_la_rootdir = $(mydatadir)
 libsciscicos_la_root_DATA = changelog.txt licence.txt readme.txt VERSION.xml
 
 
 #### scicos : init scripts #### 
-libsciscicos_la_etcdir = $(target)/etc
+libsciscicos_la_etcdir = $(mydatadir)/etc
 libsciscicos_la_etc_DATA = etc/scicos.quit etc/scicos.start
 
 #### scicos : gateway declaration #### 
-libsciscicos_la_sci_gatewaydir = $(target)/sci_gateway
+libsciscicos_la_sci_gatewaydir = $(mydatadir)/sci_gateway
 libsciscicos_la_sci_gateway_DATA = sci_gateway/scicos_gateway.xml
 
 
 #### scicos : include files ####
-libsciscicos_la_includedir=$(sciincludedir)/scicos
+libsciscicos_la_includedir=$(pkgincludedir)/scicos
 libsciscicos_la_include_HEADERS = includes/import.h \
 includes/cc_pass2.h \
 includes/scicos_block.h \
@@ -261,7 +261,7 @@ includes/blocks.h
 
 
 #### scicos : demos files ####
-libsciscicos_la_demosdir=$(target)
+libsciscicos_la_demosdir=$(mydatadir)
 nobase_libsciscicos_la_demos_DATA = demos/CodeGen/Fibo_standalone.c \
 demos/CodeGen/Therm.cosf \
 demos/CodeGen/Therm_standalone.c \
@@ -323,7 +323,7 @@ NO_SCICOS_C_SOURCES = src/c/noscicos/noscicos.c
 
 libsciscicos_la_SOURCES = $(NO_SCICOS_C_SOURCES)
 
-libsciscicos_la_includedir=$(sciincludedir)/scicos
+libsciscicos_la_includedir=$(pkgincludedir)/scicos
 libsciscicos_la_include_HEADERS = src/c/noscicos/resource.h
 
 endif
index a59f964..3e345cf 100644 (file)
@@ -5,22 +5,22 @@
 
 
 #### Target ######
-target=$(datadir)/modules/scilab2fortran
+modulename=scilab2fortran
 
 
 #### scilab2fortran : Conf files ####
-libscilab2fortran_la_rootdir = $(target)
+libscilab2fortran_la_rootdir = $(mydatadir)
 libscilab2fortran_la_root_DATA = changelog.txt licence.txt readme.txt VERSION.xml
 
 
 #### scilab2fortran : init scripts #### 
-libscilab2fortran_la_etcdir = $(target)/etc
+libscilab2fortran_la_etcdir = $(mydatadir)/etc
 libscilab2fortran_la_etc_DATA = etc/scilab2fortran.quit etc/scilab2fortran.start
 
 
 
 #### scilab2fortran : demos files ####
-libscilab2fortran_la_demosdir=$(target)/demos/
+libscilab2fortran_la_demosdir=$(mydatadir)/demos/
 libscilab2fortran_la_demos_DATA = demos/dem1.sce \
 demos/dem2.sce \
 demos/dem3.sce \
index 1ef8a91..7033e27 100644 (file)
@@ -5,18 +5,18 @@
 
 
 #### Target ######
-target=$(datadir)/modules/scipad
+modulename=scipad
 
 
 #### scipad : Conf files ####
-libsciscipad_la_rootdir = $(target)
+libsciscipad_la_rootdir = $(mydatadir)
 libsciscipad_la_root_DATA = changelog.txt licence.txt readme.txt VERSION.xml
 
 
 MACROSDIRSEXT = macros/scipad_internals
 
 #### scipad : init scripts #### 
-libsciscipad_la_etcdir = $(target)/etc
+libsciscipad_la_etcdir = $(mydatadir)/etc
 libsciscipad_la_etc_DATA = etc/scipad.quit etc/scipad.start
 
 
index 47c97ed..44854f5 100644 (file)
@@ -107,31 +107,31 @@ libscisignal_processing_la_LIBADD = \
 
 
 #### Target ######
-target=$(datadir)/modules/signal_processing
+modulename=signal_processing
 
 
 #### signal_processing : Conf files ####
-libscisignal_processing_la_rootdir = $(target)
+libscisignal_processing_la_rootdir = $(mydatadir)
 libscisignal_processing_la_root_DATA = changelog.txt licence.txt readme.txt VERSION.xml
 
 
 #### signal_processing : init scripts #### 
-libscisignal_processing_la_etcdir = $(target)/etc
+libscisignal_processing_la_etcdir = $(mydatadir)/etc
 libscisignal_processing_la_etc_DATA = etc/signal_processing.quit etc/signal_processing.start
 
 #### signal_processing : gateway declaration #### 
-libscisignal_processing_la_sci_gatewaydir = $(target)/sci_gateway
+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=$(sciincludedir)/signal_processing
+libscisignal_processing_la_includedir=$(pkgincludedir)/signal_processing
 libscisignal_processing_la_include_HEADERS = includes/gw_signal.h
 
 
 #### signal_processing : demos files ####
-libscisignal_processing_la_demosdir=$(target)
+libscisignal_processing_la_demosdir=$(mydatadir)
 nobase_libscisignal_processing_la_demos_DATA = demos/arma/arma1.dem \
 demos/arma/arma2.dem \
 demos/arma/arma3.dem \
index c3dd51e..3ad1b16 100644 (file)
@@ -29,29 +29,29 @@ libscisound_la_LIBADD = \
 
 
 #### Target ######
-target=$(datadir)/modules/sound
+modulename=sound
 
 
 #### sound : Conf files ####
-libscisound_la_rootdir = $(target)
+libscisound_la_rootdir = $(mydatadir)
 libscisound_la_root_DATA = changelog.txt licence.txt readme.txt VERSION.xml
 
 
 #### sound : init scripts #### 
-libscisound_la_etcdir = $(target)/etc
+libscisound_la_etcdir = $(mydatadir)/etc
 libscisound_la_etc_DATA = etc/sound.quit etc/sound.start
 
 #### sound : gateway declaration #### 
-libscisound_la_sci_gatewaydir = $(target)/sci_gateway
+libscisound_la_sci_gatewaydir = $(mydatadir)/sci_gateway
 libscisound_la_sci_gateway_DATA = sci_gateway/sound_gateway.xml
 
 #### sound : include files ####
-libscisound_la_includedir=$(sciincludedir)/sound
+libscisound_la_includedir=$(pkgincludedir)/sound
 libscisound_la_include_HEADERS = includes/gw_sound.h
 
 
 #### sound : demos files ####
-libscisound_la_demosdir=$(target)/demos/
+libscisound_la_demosdir=$(mydatadir)/demos/
 libscisound_la_demos_DATA = demos/chimes.wav \
 demos/sound.dem
 
index 76a4285..aef693b 100644 (file)
@@ -176,24 +176,24 @@ libscisparse_la_LIBADD = \
 
 
 #### Target ######
-target=$(datadir)/modules/sparse
+modulename=sparse
 
 
 #### sparse : Conf files ####
-libscisparse_la_rootdir = $(target)
+libscisparse_la_rootdir = $(mydatadir)
 libscisparse_la_root_DATA = changelog.txt licence.txt readme.txt VERSION.xml
 
 
 #### sparse : init scripts #### 
-libscisparse_la_etcdir = $(target)/etc
+libscisparse_la_etcdir = $(mydatadir)/etc
 libscisparse_la_etc_DATA = etc/sparse.quit etc/sparse.start
 
 #### sparse : gateway declaration #### 
-libscisparse_la_sci_gatewaydir = $(target)/sci_gateway
+libscisparse_la_sci_gatewaydir = $(mydatadir)/sci_gateway
 libscisparse_la_sci_gateway_DATA = sci_gateway/sparse_gateway.xml
 
 #### sparse : include files ####
-libscisparse_la_includedir=$(sciincludedir)/sparse
+libscisparse_la_includedir=$(pkgincludedir)/sparse
 libscisparse_la_include_HEADERS = includes/gw_sparse.h \
 includes/spmalloc.h \
 includes/sp.h \
index 43a11d8..d7dd3eb 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=$(sciincludedir)/special_functions
+libscispecial_functions_la_includedir=$(pkgincludedir)/special_functions
 
 libscispecial_functions_la_include_HEADERS = includes/gw_special_functions1.h \
 includes/gw_special_functions2.h
@@ -53,19 +53,19 @@ libscispecial_functions_la_LIBADD = \
 
 
 #### Target ######
-target=$(datadir)/modules/special_functions
+modulename=special_functions
 
 
 #### special_functions : Conf files ####
-libscispecial_functions_la_rootdir = $(target)
+libscispecial_functions_la_rootdir = $(mydatadir)
 libscispecial_functions_la_root_DATA = changelog.txt licence.txt readme.txt VERSION.xml
 
 #### special_functions : init scripts #### 
-libscispecial_functions_la_etcdir = $(target)/etc
+libscispecial_functions_la_etcdir = $(mydatadir)/etc
 libscispecial_functions_la_etc_DATA = etc/special_functions.quit etc/special_functions.start
 
 #### special_functions : gateway declaration #### 
-libscispecial_functions_la_sci_gatewaydir = $(target)/sci_gateway
+libscispecial_functions_la_sci_gatewaydir = $(mydatadir)/sci_gateway
 libscispecial_functions_la_sci_gateway_DATA = sci_gateway/special_functions_gateway.xml
 
 include $(top_srcdir)/Makefile.incl.am
index 8ef265d..c18d754 100644 (file)
@@ -106,25 +106,25 @@ libscistatistics_la_LIBADD = \
 
 
 #### Target ######
-target=$(datadir)/modules/statistics
+modulename=statistics
 
 
 #### statistics : Conf files ####
-libscistatistics_la_rootdir = $(target)
+libscistatistics_la_rootdir = $(mydatadir)
 libscistatistics_la_root_DATA = changelog.txt licence.txt readme.txt VERSION.xml
 
 
 #### statistics : init scripts #### 
-libscistatistics_la_etcdir = $(target)/etc
+libscistatistics_la_etcdir = $(mydatadir)/etc
 libscistatistics_la_etc_DATA = etc/statistics.quit etc/statistics.start
 
 #### statistics : gateway declaration #### 
-libscistatistics_la_sci_gatewaydir = $(target)/sci_gateway
+libscistatistics_la_sci_gatewaydir = $(mydatadir)/sci_gateway
 libscistatistics_la_sci_gateway_DATA = sci_gateway/statistics_gateway.xml
 
 
 #### statistics : include files ####
-libscistatistics_la_includedir=$(sciincludedir)/statistics
+libscistatistics_la_includedir=$(pkgincludedir)/statistics
 libscistatistics_la_include_HEADERS = includes/gw_statistics.h
 
 include $(top_srcdir)/Makefile.incl.am
index fb6b099..b62778b 100644 (file)
@@ -60,23 +60,23 @@ libscistring_la_LIBADD = \
 
 
 #### Target ######
-target=$(datadir)/modules/string
+modulename=string
 
 
 #### string : Conf files ####
-libscistring_la_rootdir = $(target)
+libscistring_la_rootdir = $(mydatadir)
 libscistring_la_root_DATA = changelog.txt licence.txt readme.txt VERSION.xml
 
 #### string : init scripts #### 
-libscistring_la_etcdir = $(target)/etc
+libscistring_la_etcdir = $(mydatadir)/etc
 libscistring_la_etc_DATA = etc/string.quit etc/string.start
 
 #### string : gateway declaration #### 
-libscistring_la_sci_gatewaydir = $(target)/sci_gateway
+libscistring_la_sci_gatewaydir = $(mydatadir)/sci_gateway
 libscistring_la_sci_gateway_DATA = sci_gateway/string_gateway.xml
 
 #### string : include files ####
-libscistring_la_includedir=$(sciincludedir)/string
+libscistring_la_includedir=$(pkgincludedir)/string
 libscistring_la_include_HEADERS = includes/men_Sutils.h \
 includes/gw_string.h
 
index c8f6b58..6072440 100644 (file)
@@ -72,23 +72,23 @@ libscistring_la_LIBADD = \
 
 
 #### Target ######
-target=$(datadir)/modules/string
+modulename=string
 
 
 #### string : Conf files ####
-libscistring_la_rootdir = $(target)
+libscistring_la_rootdir = $(mydatadir)
 libscistring_la_root_DATA = changelog.txt licence.txt readme.txt VERSION.xml
 
 #### string : init scripts #### 
-libscistring_la_etcdir = $(target)/etc
+libscistring_la_etcdir = $(mydatadir)/etc
 libscistring_la_etc_DATA = etc/string_V2.quit etc/string_V2.start
 
 #### string : gateway declaration #### 
-libscistring_la_sci_gatewaydir = $(target)/sci_gateway
+libscistring_la_sci_gatewaydir = $(mydatadir)/sci_gateway
 libscistring_la_sci_gateway_DATA = sci_gateway/string_V2_gateway.xml
 
 #### string : include files ####
-libscistring_la_includedir=$(sciincludedir)/string
+libscistring_la_includedir=$(pkgincludedir)/string
 libscistring_la_include_HEADERS = includes/men_Sutils.h \
 includes/gw_string.h
 
index 0a9a4e1..50cdb02 100644 (file)
@@ -27,25 +27,25 @@ $(top_builddir)/modules/core/libscicore.la
 
 
 #### Target ######
-target=$(datadir)/modules/symbolic
+modulename=symbolic
 
 
 #### symbolic : Conf files ####
-libscisymbolic_la_rootdir = $(target)
+libscisymbolic_la_rootdir = $(mydatadir)
 libscisymbolic_la_root_DATA = changelog.txt licence.txt readme.txt VERSION.xml
 
 
 #### symbolic : init scripts #### 
-libscisymbolic_la_etcdir = $(target)/etc
+libscisymbolic_la_etcdir = $(mydatadir)/etc
 libscisymbolic_la_etc_DATA = etc/symbolic.quit etc/symbolic.start
 
 #### symbolic : gateway declaration #### 
-libscisymbolic_la_sci_gatewaydir = $(target)/sci_gateway
+libscisymbolic_la_sci_gatewaydir = $(mydatadir)/sci_gateway
 libscisymbolic_la_sci_gateway_DATA = sci_gateway/symbolic_gateway.xml 
 
 
 #### symbolic : include files ####
-libscisymbolic_la_includedir=$(sciincludedir)/symbolic
+libscisymbolic_la_includedir=$(pkgincludedir)/symbolic
 libscisymbolic_la_include_HEADERS = includes/gw_symbolic.h
 
 include $(top_srcdir)/Makefile.incl.am
index 7fc1998..f89dc23 100644 (file)
@@ -50,16 +50,16 @@ libscitclsci_la_LIBADD = \
        $(top_builddir)/libs/MALLOC/libscimalloc.la
 
 #### Target ######
-target=$(datadir)/modules/tclsci
+modulename=tclsci
 
 
 #### tclsci : Conf files ####
-libscitclsci_la_rootdir = $(target)
+libscitclsci_la_rootdir = $(mydatadir)
 libscitclsci_la_root_DATA = changelog.txt licence.txt readme.txt VERSION.xml
 
 
 ### TCL macros ###
-libscitclsci_la_tcldir = $(target)
+libscitclsci_la_tcldir = $(mydatadir)
 nobase_libscitclsci_la_tcl_DATA = tcl/utils/tk_choose.tcl \
 tcl/utils/Notebook.tcl \
 tcl/utils/Balloon.tcl \
@@ -251,15 +251,15 @@ tcl/misc.tcl \
 tcl/set.tcl
 
 #### tclsci : init scripts #### 
-libscitclsci_la_etcdir = $(target)/etc
+libscitclsci_la_etcdir = $(mydatadir)/etc
 libscitclsci_la_etc_DATA = etc/tclsci.quit etc/tclsci.start
 
 #### tclsci : gateway declaration #### 
-libscitclsci_la_sci_gatewaydir = $(target)/sci_gateway
+libscitclsci_la_sci_gatewaydir = $(mydatadir)/sci_gateway
 libscitclsci_la_sci_gateway_DATA = sci_gateway/tclsci_gateway.xml
 
 #### tclsci : include files ####
-libscitclsci_la_includedir=$(sciincludedir)/tclsci
+libscitclsci_la_includedir=$(pkgincludedir)/tclsci
 libscitclsci_la_include_HEADERS = includes/sci_TCL_GetVar.h \
 includes/TclUiSet.h \
 includes/GedManagement.h \
@@ -273,14 +273,14 @@ includes/InitializeTclTk.h
 
 
 #### tclsci : demos files sciGUI ####
-libscitclsci_la_demossciGUIdir=$(target)/demos/sciGUI/
+libscitclsci_la_demossciGUIdir=$(mydatadir)/demos/sciGUI/
 libscitclsci_la_demossciGUI_DATA = demos/sciGUI/sciGUIdemo.dpf \
 demos/sciGUI/test_demoplay.dpf \
 demos/sciGUI/scilab01.gif \
 demos/sciGUI/logo01.gif
 
 #### tclsci : demos files tk ####
-libscitclsci_la_demostkdir=$(target)/demos/tk/
+libscitclsci_la_demostkdir=$(mydatadir)/demos/tk/
 libscitclsci_la_demostk_DATA = demos/tk/timer \
 demos/tk/tk.dem \
 demos/tk/rolodex.sce \
index 0459439..0370d20 100644 (file)
@@ -6,18 +6,18 @@
 
 
 #### Target ######
-target=$(datadir)/modules/texmacs
+modulename=texmacs
 
 
 #### texmacs : Conf files ####
-libscitexmacs_la_rootdir = $(target)
+libscitexmacs_la_rootdir = $(mydatadir)
 libscitexmacs_la_root_DATA = changelog.txt licence.txt readme.txt VERSION.xml
 
 
 
 
 #### texmacs : init scripts #### 
-libscitexmacs_la_etcdir = $(target)/etc
+libscitexmacs_la_etcdir = $(mydatadir)/etc
 libscitexmacs_la_etc_DATA = etc/texmacs.quit etc/texmacs.start
 
 include $(top_srcdir)/Makefile.incl.am
index 7ee7903..d957aeb 100644 (file)
@@ -32,24 +32,24 @@ libscitime_la_LIBADD = \
 
 
 #### Target ######
-target=$(datadir)/modules/time
+modulename=time
 
 
 #### time : Conf files ####
-libscitime_la_rootdir = $(target)
+libscitime_la_rootdir = $(mydatadir)
 libscitime_la_root_DATA = changelog.txt licence.txt readme.txt VERSION.xml
 
 
 #### time : init scripts #### 
-libscitime_la_etcdir = $(target)/etc
+libscitime_la_etcdir = $(mydatadir)/etc
 libscitime_la_etc_DATA = etc/time.quit etc/time.start
 
 #### time : gateway declaration #### 
-libscitime_la_sci_gatewaydir = $(target)/sci_gateway
+libscitime_la_sci_gatewaydir = $(mydatadir)/sci_gateway
 libscitime_la_sci_gateway_DATA = sci_gateway/time_gateway.xml
 
 #### time : include files ####
-libscitime_la_includedir=$(sciincludedir)/time
+libscitime_la_includedir=$(pkgincludedir)/time
 libscitime_la_include_HEADERS = includes/gw_time.h \
 includes/sci_getdate.h \
 includes/sci_timer.h \
index 4fccd80..3c864bf 100644 (file)
@@ -37,24 +37,24 @@ libsciwintools_la_LIBADD = \
 
 
 #### Target ######
-target=$(datadir)/modules/wintools
+modulename=wintools
 
 
 #### wintools : Conf files ####
-libsciwintools_la_rootdir = $(target)
+libsciwintools_la_rootdir = $(mydatadir)
 libsciwintools_la_root_DATA = changelog.txt licence.txt readme.txt VERSION.xml
 
 #### wintools : init scripts #### 
-libsciwintools_la_etcdir = $(target)/etc
+libsciwintools_la_etcdir = $(mydatadir)/etc
 libsciwintools_la_etc_DATA = etc/wintools.quit etc/wintools.start 
 
 
 #### wintools : gateway declaration #### 
-libsciwintools_la_sci_gatewaydir = $(target)/sci_gateway
+libsciwintools_la_sci_gatewaydir = $(mydatadir)/sci_gateway
 libsciwintools_la_sci_gateway_DATA = sci_gateway/wintools_gateway.xml
 
 #### wintools : include files ####
-libsciwintools_la_includedir=$(sciincludedir)/wintools
+libsciwintools_la_includedir=$(pkgincludedir)/wintools
 libsciwintools_la_include_HEADERS = includes/gw_wintools.h \
 includes/interfdde.h \
 includes/TextToPrint.h