Fix a bug of configure step: if scripts sources are changed in bin directory they...

diff --git a/bin/Makefile.am b/bin/Makefile.am
index ef2966ef042abf72ac4d028b9f076cf574cf163a..077743e33a951e53e8dab7cc4c4dac0ff93978f2 100644 (file)
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -32,41 +32,44 @@ include $(top_srcdir)/salome_adm/unix/make_common_starter.am
 #
 
 # These files are data, module or lib files
-dist_salomescript_DATA= \
-       VERSION \
-       orbmodule.py \
-       salomeConsole.py \
-       salome_session.py
+dist_salomescript_DATA =       \
+       config_appli.xml        \
+       salome.launch           \
+       VERSION
 
 # These files are executable scripts
-dist_salomescript_SCRIPTS=\
-       envSalome.py \
-       runIDLparser \
-       runSalome.py \
-       killSalome.py \
-       killSalomeWithPort.py \
-       runSalome \
-       runSalome.csh \
-       runNS.sh \
-       createAppli.sh \
-       appli_install.sh \
-       appli_clean.sh \
-       appli_gen.py \
-       virtual_salome.py \
-       config_appli.xml \
-       launchConfigureParser.py \
-       showNS.py \
-       addToKillList.py \
-       NSparam.py \
-       setenv.py \
-       launchSalome.py \
-       nameserver.py \
-        server.py \
-       waitNS.sh \
-       waitNS.py \
-       waitContainers.py \
-       shutdownSalome.py \
-       salome_utilities.py
+dist_salomescript_SCRIPTS =            \
+       addToKillList.py                \
+       appli_clean.sh                  \
+       appli_gen.py                    \
+       appli_install.sh                \
+       createAppli.sh                  \
+       envSalome.py                    \
+       killSalome.py                   \
+       killSalomeWithPort.py           \
+       launchConfigureParser.py        \
+       launchSalome.py                 \
+       nameserver.py                   \
+       NSparam.py                      \
+       orbmodule.py                    \
+       runIDLparser                    \
+       runNS.py                        \
+       runNS.sh                        \
+       runSalome                       \
+       runSalome.csh                   \
+       runSalome.ksh                   \
+       runSalome.py                    \
+       salomeConsole.py                \
+       salome_session.py               \
+       salome_utilities.py             \
+       server.py                       \
+       setenv.py                       \
+       showNS.py                       \
+       shutdownSalome.py               \
+       virtual_salome.py               \
+       waitContainers.py               \
+       waitNS.py                       \
+       waitNS.sh
 
 EXTRA_DIST = appliskel
 
@@ -75,21 +78,17 @@ dist-hook:
 
 DISTCLEANFILES = $(top_builddir)/bin/salome/Makefile.am
 
-clean-local:
-       rm -rf $(top_builddir)/bin/salome/appliskel
-       cd $(top_builddir)/bin/salome; \
-       rm -f $(dist_salomescript_DATA) $(dist_salomescript_SCRIPTS)
-
 # This is an ugly target to avoid exploring the appliskel subdirectory.
 install-exec-local:
        $(INSTALL) -d $(DESTDIR)$(salomescriptdir)
        $(RM) -rf $(DESTDIR)$(salomescriptdir)/appliskel 1> /dev/null 2>&1
        cp -r $(srcdir)/appliskel $(DESTDIR)$(salomescriptdir)
+       chmod a+x -R $(DESTDIR)$(salomescriptdir)/appliskel
        find $(DESTDIR)$(salomescriptdir) -name CVS -prune -exec rm -rf {} \;
 
 uninstall-local:
        if test -d $(DESTDIR)$(salomescriptdir)/appliskel; then \
          find $(DESTDIR)$(salomescriptdir)/appliskel -exec chmod +w {} ';' ; \
-    rm -rf $(DESTDIR)$(salomescriptdir)/appliskel; \
-  fi;
+         rm -rf $(DESTDIR)$(salomescriptdir)/appliskel; \
+       fi;
 

diff --git a/configure.ac b/configure.ac
index 15a052c93b7dce150b2ae11b03bc085443c8bd6c..ff833ce3d6184f9c4b7a6a24e1a27a3f94f351b2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -475,39 +475,12 @@ else
    AC_SUBST(SETX) SETX="set -x"
 fi
 
-echo 
-echo ---------------------------------------------
-echo copying resource files, shell scripts, and 
-echo xml files
-echo ---------------------------------------------
-echo
-
-
-mkdir -p bin/salome
-cd bin/salome
-for i in  `find $ROOT_SRCDIR/bin`
-do
-  local_bin=`echo $i | sed -e "s,$ROOT_SRCDIR/bin,.,"`
-  case "$local_bin" in
-        *.in | *~) ;;
-        . | */CVS | */CVS/* | ./salome) ;;
-        ./appliskel |./appliskel/env.d) $INSTALL -d $local_bin ; echo $local_bin ;;
-        *) $INSTALL $i $local_bin; echo $local_bin ;;
-  esac
-done
-cd $ROOT_BUILDDIR
-
 echo
 echo ---------------------------------------------
 echo generating Makefiles and configure files
 echo ---------------------------------------------
 echo
 
-AC_OUTPUT_COMMANDS([ \
-       chmod +x ./bin/*; \
-       chmod +x ./bin/salome/* \
-])
-
 # This list is initiated using autoscan and must be updated manually
 # when adding a new file <filename>.in to manage. When you execute
 # autoscan, the Makefile list is generated in the output file configure.scan.
@@ -518,7 +491,7 @@ AC_OUTPUT([ \
        ./salome_adm/Makefile \
        ./salome_adm/unix/Makefile \
        ./salome_adm/unix/config_files/Makefile \
-       Makefile \
+       ./Makefile \
        ./bin/Makefile \
        ./bin/VERSION \
        ./bin/runIDLparser \