diff options
author | 2009-04-08 15:50:39 +0000 | |
---|---|---|
committer | 2009-04-08 15:50:39 +0000 | |
commit | 0cf541452e6bb56ddddfae6bd9c1e08fbd47a687 (patch) | |
tree | e78edf4a33bdc4836bf10f589c07965d22109941 /Makefile | |
parent | aa40ae5b2fe08d65f62200e65fe6da9467f55e51 (diff) |
Backport of Eric Le Lay's patch (bug report #2078) from v8.2 branch
(r12063) for smooth compilation/installation under Solaris (/bin/sh ->
/bin/bash, -or -> -o in find, echo -n -> printf, ! in test rather than
in if).
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@12065 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 32 |
1 files changed, 16 insertions, 16 deletions
@@ -1,6 +1,6 @@ ####################################################################### # v # The Coq Proof Assistant / The Coq Development Team # -# <O___,, # INRIA-Rocquencourt & LRI-CNRS-Orsay # +# <O___,, # INRIA-Rocquencourt & LRI-CNRS-osay # # \VV/ ############################################################# # // # This file is distributed under the terms of the # # # GNU Lesser General Public License Version 2.1 # @@ -66,21 +66,21 @@ # but doesn't care if this build fails. This can be quite surprising, # see in particular the -include in Makefile.stage* - +export SHELL:=/bin/bash # !! Before using FIND_VCS_CLAUSE, please read how you should in the !! # !! FIND_VCS_CLAUSE section of dev/doc/build-system.dev.txt !! export FIND_VCS_CLAUSE:='(' \ - -name '{arch}' -or \ - -name '.svn' -or \ - -name '_darcs' -or \ - -name '.git' -or \ - -name '.bzr' -or \ - -name 'debian' -or \ - -name "$${GIT_DIR}" -or \ + -name '{arch}' -o \ + -name '.svn' -o \ + -name '_darcs' -o \ + -name '.git' -o \ + -name '.bzr' -o \ + -name 'debian' -o \ + -name "$${GIT_DIR}" -o \ -name '_build' \ -')' -prune -or -export PRUNE_CHECKER := -wholename ./checker/\* -prune -or +')' -prune -o +export PRUNE_CHECKER := -wholename ./checker/\* -prune -o FIND_PRINTF_P:=-print | sed 's|^\./||' @@ -189,16 +189,16 @@ clean: objclean cruftclean depclean docclean devdocclean objclean: archclean indepclean cruftclean: ml4clean - find . -name '*~' -or -name '*.annot' | xargs rm -f + find . -name '*~' -o -name '*.annot' | xargs rm -f rm -f gmon.out core indepclean: rm -f $(GENFILES) rm -f $(COQTOPBYTE) $(COQMKTOPBYTE) $(COQCBYTE) $(CHICKENBYTE) rm -f bin/coq-interface$(EXE) bin/coq-parser$(EXE) - find . -name '*~' -or -name '*.cm[ioa]' | xargs rm -f + find . -name '*~' -o -name '*.cm[ioa]' | xargs rm -f find . -name '*_mod.ml' | xargs rm -f - find plugins test-suite -name '*.vo' -or -name '*.glob' | xargs rm -f + find plugins test-suite -name '*.vo' -o -name '*.glob' | xargs rm -f rm -f */*.pp[iox] plugins/*/*.pp[iox] rm -rf $(SOURCEDOCDIR) rm -f toplevel/mltop.byteml toplevel/mltop.optml @@ -227,7 +227,7 @@ archclean: clean-ide cleantheories rm -f $(COQTOPEXE) $(COQMKTOP) $(COQC) $(CHICKEN) $(COQDEPBOOT) rm -f $(COQTOPOPT) $(COQMKTOPOPT) $(COQCOPT) $(CHICKENOPT) rm -f bin/coq-parser.opt$(EXE) bin/coq-interface.opt$(EXE) - find . -name '*.cmx' -or -name '*.cmxs' -or -name '*.cmxa' -or -name '*.[soa]' -or -name '*.so' | xargs rm -f + find . -name '*.cmx' -o -name '*.cmxs' -o -name '*.cmxa' -o -name '*.[soa]' -o -name '*.so' | xargs rm -f rm -f $(TOOLS) $(CSDPCERT) rm -rf _build myocamlbuild_config.ml @@ -254,7 +254,7 @@ distclean: clean cleanconfig cleantheories: rm -f states/*.coq - find theories -name '*.vo' -or -name '*.glob' | xargs rm -f + find theories -name '*.vo' -o -name '*.glob' | xargs rm -f devdocclean: find . -name '*.dep.ps' -o -name '*.dot' -exec rm -f {} \; |