Join modifications from BR_Dev_For_4_0 tag V4_1_1.

[modules/kernel.git] / salome_adm / unix / make_common_starter.am

diff --git a/salome_adm/unix/make_common_starter.am b/salome_adm/unix/make_common_starter.am
index 220be3f5ead6e451916d02ff1c63a12c43584db7..f54d8f4f2f05e3d0c3aa00e6f3e9de4f6afa6ba5 100644 (file)
--- a/salome_adm/unix/make_common_starter.am
+++ b/salome_adm/unix/make_common_starter.am
@@ -7,24 +7,28 @@
 #
 
 # Standard directory for installation
-salomeincludedir   = $(includedir)/@PACKAGE@
-libdir             = $(prefix)/lib@LIB_LOCATION_SUFFIX@/@PACKAGE@
-bindir             = $(prefix)/bin/@PACKAGE@
+salomeincludedir   = $(includedir)/salome
+libdir             = $(prefix)/lib@LIB_LOCATION_SUFFIX@/salome
+bindir             = $(prefix)/bin/salome
 salomescriptdir    = $(bindir)
+salomepythondir    = $(pythondir)/salome
+salomepyexecdir    = $(pyexecdir)/salome
+
 
 # Directory for installing idl files
-salomeidldir       = $(prefix)/idl/@PACKAGE@
+salomeidldir       = $(prefix)/idl/salome
 
 # Directory for installing resource files
-salomeresdir       = $(prefix)/share/@PACKAGE@/resources
+salomeresdir       = $(prefix)/share/salome/resources/@MODULE_NAME@
 
 # Directories for installing admin files
 salomeadmdir       = $(prefix)/salome_adm
 salomeadmuxdir     = $(salomeadmdir)/unix
 salomem4dir        = $(salomeadmdir)/unix/config_files
+salome4deprdir    = $(salomeadmdir)/unix/config_files/DEPRECATED
 
 # Shared modules installation directory
-sharedpkgpythondir =$(pkgpythondir)/shared_modules
+sharedpkgpythondir =$(salomepythondir)/shared_modules
 
 # Documentation directory
-docdir             = $(datadir)/doc/@PACKAGE@
+docdir             = $(datadir)/doc/salome