From 57c2f0e41793bb582a89f83c68024f4bc689dd13 Mon Sep 17 00:00:00 2001
From: prascle <prascle>
Date: Tue, 23 May 2006 08:29:00 +0000
Subject: [PATCH] PR: previous correction of bug 12461 was incompatible with
 other modules

---
 clean_configure                     |  1 -
 salome_adm/unix/Makefile.am         | 11 ++++--
 salome_adm/unix/SALOMEconfig.ref.in | 57 +++++++++++++++++++++++++++++
 3 files changed, 65 insertions(+), 4 deletions(-)
 create mode 100644 salome_adm/unix/SALOMEconfig.ref.in

diff --git a/clean_configure b/clean_configure
index de52cd1e0..a0073fb98 100755
--- a/clean_configure
+++ b/clean_configure
@@ -13,7 +13,6 @@ cd $libdir
 rm -f config.guess config.sub ltmain.sh
 # Files created by automake
 rm -rf install-sh missing compile depcomp py-compile
-rm -f salome_adm/unix/SALOMEconfig.ref.in
 cd $here
 find bin -name Makefile.in | xargs rm -f
 find doc -name Makefile.in | xargs rm -f
diff --git a/salome_adm/unix/Makefile.am b/salome_adm/unix/Makefile.am
index a7b1f6506..f8d42e065 100644
--- a/salome_adm/unix/Makefile.am
+++ b/salome_adm/unix/Makefile.am
@@ -14,8 +14,14 @@ DEPRECATED_FILES=\
 	DEPRECATED/make_omniorb.in
 
 # rules for install and build (see make_common_starter.am)
-salomeadmux_DATA = SALOMEconfig.h
-BUILT_SOURCES=SALOMEconfig.h
+salomeadmux_DATA = SALOMEconfig.h.in
+BUILT_SOURCES=SALOMEconfig.h SALOMEconfig.h.in
+
+mostlyclean-local:
+	-rm -rf SALOMEconfig.h SALOMEconfig.h.in
+
+SALOMEconfig.h.in : SALOMEconfig.ref.in
+	cp -p $< $@;
 
 # test if SALOMEconfig.ref has changed (contents), at build time
 SALOMEconfig.h: $(top_builddir)/salome_adm/unix/SALOMEconfig.ref
@@ -29,6 +35,5 @@ SALOMEconfig.h: $(top_builddir)/salome_adm/unix/SALOMEconfig.ref
 # The deprecated files are deprecated for the KERNEL but not for the
 # related modules (GUI, MED, ...), for now. Some files have to be installed.
 dist_salomeadmux_DATA=\
-	SALOMEconfig.h \
 	pythonbe.py \
 	$(DEPRECATED_FILES)
diff --git a/salome_adm/unix/SALOMEconfig.ref.in b/salome_adm/unix/SALOMEconfig.ref.in
new file mode 100644
index 000000000..22372e97a
--- /dev/null
+++ b/salome_adm/unix/SALOMEconfig.ref.in
@@ -0,0 +1,57 @@
+/*----------------------------------------------------------------------------------
+  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
+ 
+  This library is free software; you can redistribute it and/or 
+  modify it under the terms of the GNU Lesser General Public 
+  License as published by the Free Software Foundation; either 
+  version 2.1 of the License. 
+ 
+  This library is distributed in the hope that it will be useful, 
+  but WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
+  Lesser General Public License for more details. 
+ 
+  You should have received a copy of the GNU Lesser General Public 
+  License along with this library; if not, write to the Free Software 
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
+ 
+  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+------------------------------------------------------------------------------------*/
+
+#ifndef SALOME_CONFIG_H
+#define SALOME_CONFIG_H
+
+#define DEBUG
+
+#define QUOTE(x)  #x
+#define CORBA_CLIENT_HEADER(x)  QUOTE(x@IDL_CLN_H@)
+#define CORBA_SERVER_HEADER(x)  QUOTE(x@IDL_SRV_H@)
+
+#ifndef @MACHINE@
+  #define @MACHINE@
+#endif
+
+
+/* A path to a rcp-like command */
+#define RCP "@RCP@"
+
+/* A path to a rm-like command */
+#define RM "@RM@"
+
+/* A path to a cp-like command */
+#define CP "@CP@"
+
+/* A path to a rsh-like command */
+#define RSH "@RSH@"
+
+/* A path to a scp-like command */
+#define SCP "@SCP@"
+
+/* A path to a sh-like command */
+#define SH "@SH@"
+
+/* A path to a ssh-like command */
+#define SSH "@SSH@"
+
+#endif
-- 
2.39.2