From 2051921d308fb419539f84c34f3d4a0748175496 Mon Sep 17 00:00:00 2001 From: prascle Date: Fri, 24 Oct 2008 13:16:12 +0000 Subject: [PATCH] PR: problem in merge configure.ac and make distcheck --- bin/Makefile.am | 5 ----- configure.ac | 29 ----------------------------- 2 files changed, 34 deletions(-) diff --git a/bin/Makefile.am b/bin/Makefile.am index 0a7014d6f..328b52a91 100644 --- 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 46c0db90a..75f1894e6 100644 --- 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 -- 2.39.2