PR: make_commence is available for other modules (no need of recheck what is done...

diff --git a/Makefile.in b/Makefile.in
index a72a6aeedbd13df14623460d348e97c4a013f0f0..52b547b1e438bc9707e1d2a764ae486653b6e8df 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -129,6 +129,13 @@ depend_idl:
 #doc:
 #      (cd doc && $(MAKE) $@) || exit 1
 
+# Install make_commence make_conclude ... for other modules
+install-make:
+       ($(INSTALL) -d  $(incmakedir) || exit 1);
+       (sed 's/^prefix=/#prefix=/' $(top_builddir)/salome_adm/unix/make_commence > $(incmakedir)/make_commence || exit 1);
+       (sed 's/^prefix=/#prefix=/' $(top_builddir)/salome_adm/unix/make_conclude > $(incmakedir)/make_conclude || exit 1);
+
+
 install-end:
 # finish libtool install
 #      @$(LT) --mode=finish $(libdir)
@@ -137,7 +144,7 @@ install-include: $(include_list)
        $(INSTALL) -d  $(includedir)
        @for f in X $(include_list); do                         \
           if test $$f != X; then                               \
-            ($(INSTALL_DATA) $$f $(includedir)/. || exit 1);   \
+            (cp -p $$f $(includedir) || exit 1);               \
           fi;                                                  \
        done
 
@@ -161,5 +168,5 @@ distclean-other:
 
 @MODULE@
 
-install: install-bin install-include install-end
+install: install-bin install-include install-make install-end
 

diff --git a/salome_adm/unix/make_commence.in b/salome_adm/unix/make_commence.in
index 9f9c6a388c258330055d9cfe909caad662f9a5f0..6e3143e381619a3c3cb849d9f073ee099586ec9f 100644 (file)
--- a/salome_adm/unix/make_commence.in
+++ b/salome_adm/unix/make_commence.in
@@ -47,9 +47,8 @@ PYTHONHOME = @PYTHONHOME@
 PYTHON_INCLUDES = @PYTHON_INCLUDES@
 PYTHON_LIBS = @PYTHON_LIBS@
 PYTHON_VERSION = @PYTHON_VERSION@
-PYTHON_SITE = @PYTHON_SITE@
-PYTHON_SITE_INSTALL = @PYTHON_SITE_INSTALL@
-
+PYTHON_SITE = $(prefix)/lib/python$(PYTHON_VERSION)/site-packages
+PYTHON_SITE_INSTALL = $(prefix)/lib/python$(PYTHON_VERSION)/site-packages/salome
 # QT
 
 QT_ROOT = @QT_ROOT@
@@ -192,8 +191,9 @@ libdir=@libdir@/salome
 # warning : if user give this path in configure we could have salome/salome :-(
 includedir=@includedir@/salome
 datadir=@datadir@/salome
-idldir=$(prefix)/idl/salome
+idldir=${prefix}/idl/salome
 sharedpydir=@libdir@/python$(PYTHON_VERSION)/site-packages/salome/shared_modules
+incmakedir=${prefix}/salome_adm/unix
 
 docdir=$(datadir)/doc
 

diff --git a/salome_adm/unix/make_conclude.in b/salome_adm/unix/make_conclude.in
index e8400bcaffd777e10abface05d8ceac7094647b6..75773a0d982dfe046f3407ee4a066f1fc115a2c4 100644 (file)
--- a/salome_adm/unix/make_conclude.in
+++ b/salome_adm/unix/make_conclude.in
@@ -161,7 +161,7 @@ install: $(LIB) $(BIN) $(TEST_PROGS) $(libdir) $(includedir) $(bindir) $(datadir
 # Install exported includes in includedir
        @for f in X $(EXPORT_HEADERS:%=$(srcdir)/%); do                       \
           if test $$f != X; then                                             \
-            ($(INSTALL_DATA) $$f $(includedir)/. || exit 1);                 \
+            (cp -p $$f $(includedir) || exit 1);                             \
           fi;                                                                \
        done