Fix n.3 of hack_libtool utility to workaround problems on some Linux configurations

[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 13a4014ad9905cf026d87a075f3fa0da87ad83da..d1ebd26cdbbdfe60304f6c25a93611b3db79fad5 100644 (file)
--- a/salome_adm/unix/make_common_starter.am
+++ b/salome_adm/unix/make_common_starter.am
@@ -1,4 +1,4 @@
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 #  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 #  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,20 @@
 #
 #  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
+# ============================================================
+# The following is to avoid PACKAGE_... env variable
+# redefinition compilation warnings
+# ============================================================
+
+if !WITHONLYLAUNCHER
+    AM_CXXFLAGS = -I$(top_builddir)/salome_adm/unix -include SALOMEconfig.h
+    AM_CPPFLAGS = -I$(top_builddir)/salome_adm/unix -include SALOMEconfig.h
+else WITHONLYLAUNCHER
+    AM_CXXFLAGS =
+    AM_CPPFLAGS =
+endif
+
 # ============================================================
 # This file defines the common definitions used in several
 # Makefile. This file must be included, if needed, by the file
@@ -30,9 +44,17 @@ salomeincludedir   = $(includedir)/salome
 libdir             = $(prefix)/lib@LIB_LOCATION_SUFFIX@/salome
 bindir             = $(prefix)/bin/salome
 salomescriptdir    = $(bindir)
+# _GBO_SALOME_PYTHON_PACKAGING_
+# Maybe we could try to suppress on stage in this folder path, for
+# example by installing by default the python files in site-packages
+# folder. Then, python packages could be installed in the
+# site-packages/salome folder (main package containing the root
+# __init__.py file). This could be done by replacing salomepythondir
+# and salomepyexecdir by pythondir and pyexecdir respectively (TO BE
+# DONE)
 salomepythondir    = $(pythondir)/salome
 salomepyexecdir    = $(pyexecdir)/salome
-
+salomepypkgdir     = $(salomepythondir)/salome
 
 # Directory for installing idl files
 salomeidldir       = $(prefix)/idl/salome