PR: problem in merge configure.ac and make distcheck

diff --git a/bin/Makefile.am b/bin/Makefile.am
index 0a7014d6f0793c1effee1a70e3c08da32b594366..328b52a91d140b4bf399940910c8ccb23e265122 100644 (file)
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -78,11 +78,6 @@ 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)

diff --git a/configure.ac b/configure.ac
index 46c0db90af75e308d872b4360ff67ff9e5c18aa8..75f1894e6aded156ab4ae4c661a28c29c542243d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -494,35 +494,6 @@ else
    AC_SUBST(SETX) SETX="set -x"
 fi
 
-if test x$WITHONLYLAUNCHER = xno; then
-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
-
-AC_OUTPUT_COMMANDS([ \
-       chmod +x ./bin/*; \
-       chmod +x ./bin/salome/* \
-])
-fi
-
 echo
 echo ---------------------------------------------
 echo generating Makefiles and configure files