From: nri <nri@opencascade.com>
Date: Fri, 25 Jun 2004 12:27:35 +0000 (+0000)
Subject: DCQ : Merge with Ecole Ete a6.
X-Git-Tag: V2_0_0b1~5
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=ec3561921573349c8823bffcb0b8b5e38bfbd143;p=modules%2Fmed.git

DCQ : Merge with Ecole Ete a6.
---

diff --git a/INSTALL b/INSTALL
index 8da1ddfae..8db724e70 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,3 +1,3 @@
-This is the version 1.4.0 of MED
+This is the version 2.0.0 of MED
 Compatible with :
-	- KERNEL 1.4.0
+	- KERNEL 2.0.0
diff --git a/Makefile.in b/Makefile.in
index 4cd2fe125..269e8a520 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -14,11 +14,12 @@ VPATH=.:@srcdir@:@top_srcdir@/bin:@top_srcdir@/resources:./bin:@top_srcdir@/idl:
 
 @COMMENCE@
 
-SUBDIRS = idl src
+SUBDIRS = idl src doc
 
 RESOURCES_FILES = \
 MEDCatalog.xml \
 MED_en.xml \
+MED.config \
 Data.png \
 Infos.png \
 Structure.png \
@@ -97,10 +98,10 @@ include/salome/SALOMEconfig.h: salome_adm/unix/SALOMEconfig.ref
 # test if SALOMEconfig.h has changed (contents)
 salome_adm/unix/SALOMEconfig.ref: salome_adm/unix/SALOMEconfig.h
 	@if ! [ -a $@ ]; then \
-	  cp -p $< $@;        \
+	  cp -p -f $< $@;        \
 	fi;		      \
 	if ! cmp $< $@; then  \
-	  cp -p $< $@;        \
+	  cp -p -f $< $@;        \
 	fi;		      \
 
 include/salome/sstream: salome_adm/unix/sstream
@@ -124,7 +125,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);	\
+	     ($(INSTALL_DATA) -p $$f $(includedir)/. || exit 1);	\
 	   fi;							\
 	done
 
diff --git a/configure.in.base b/configure.in.base
index 064d002ba..73e9b8cc7 100644
--- a/configure.in.base
+++ b/configure.in.base
@@ -294,7 +294,7 @@ else
 fi
 
 # make other build directories
-for rep in salome_adm adm_local doc bin/salome include/salome lib/salome share/salome/resources share/salome/doc idl
+for rep in salome_adm adm_local doc bin/salome include/salome lib/salome share/salome/resources idl
 do
 #   if test ! -d $rep ; then
 #      eval mkdir $rep
@@ -327,14 +327,16 @@ dnl copy shells and utilities contained in the bin directory
 dnl excluding .in files (treated in AC-OUTPUT below) and CVS 
 dnl directory
 
-cd bin
+mkdir -p bin/salome
+cd bin/salome
+
 for i in $ROOT_SRCDIR/bin/*
 do
   local_bin=`echo $i | sed -e "s,$ROOT_SRCDIR,.,"`
   case "$local_bin" in
         *.in | *~)                    ;;
-        ./bin/CVS)                    ;;
-        *) ln -fs $i; echo $local_bin ;;
+        ./bin/CVS | ./bin/salome)                    ;;
+        *) /usr/bin/install -C $i .; echo $local_bin ;;
   esac
 done
 cd $ROOT_BUILDDIR