Remplacement des 'cp' et 'mkdir' par 'install'

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@11112 85f007b7-540e-0410-9357-904b9bb8a0f7

3 files changed, 49 insertions, 45 deletions

diff --git a/Makefile.build b/Makefile.build
index 6312feff70..a87d0032b2 100644
--- a/Makefile.build
+++ b/Makefile.build
@@ -426,21 +426,21 @@ install-ide-no:
 
 install-ide-byte: 
 	$(MKDIR) $(FULLBINDIR)
-	cp $(COQIDEBYTE) $(FULLBINDIR)
+	$(INSTALLBIN) $(COQIDEBYTE) $(FULLBINDIR)
 	cd $(FULLBINDIR); ln -sf coqide.byte$(EXE) coqide$(EXE)
 
 install-ide-opt:
 	$(MKDIR) $(FULLBINDIR)
-	cp $(COQIDEBYTE) $(COQIDEOPT) $(FULLBINDIR)
+	$(INSTALLBIN) $(COQIDEBYTE) $(COQIDEOPT) $(FULLBINDIR)
 	cd $(FULLBINDIR); ln -sf coqide.opt$(EXE) coqide$(EXE)
 
 install-ide-files:
 	$(MKDIR) $(FULLIDELIB)
-	cp $(IDEFILES) $(FULLIDELIB)
+	$(INSTALLLIB) $(IDEFILES) $(FULLIDELIB)
 
 install-ide-info:
 	$(MKDIR) $(FULLIDELIB)
-	cp ide/FAQ $(FULLIDELIB)
+	$(INSTALLLIB) ide/FAQ $(FULLIDELIB)
 
 ###########################################################################
 # Pcoq: special binaries for debugging (coq-interface, parser)
@@ -477,15 +477,15 @@ install-pcoq:: install-pcoq-binaries install-pcoq-files install-pcoq-manpages
 
 install-pcoq-binaries::
 	$(MKDIR) $(FULLBINDIR)
-	cp $(COQINTERFACE) $(FULLBINDIR)
+	$(INSTALLBIN) $(COQINTERFACE) $(FULLBINDIR)
 
 install-pcoq-files::
 	$(MKDIR) $(FULLCOQLIB)/contrib/interface
-	cp $(INTERFACERC) $(FULLCOQLIB)/contrib/interface
+	$(INSTALLLIB) $(INTERFACERC) $(FULLCOQLIB)/contrib/interface
 
 install-pcoq-manpages:
 	$(MKDIR) $(FULLMANDIR)/man1
-	cp $(PCOQMANPAGES) $(FULLMANDIR)/man1
+	$(INSTALLLIB) $(PCOQMANPAGES) $(FULLMANDIR)/man1
 
 ###########################################################################
 # tests
@@ -632,12 +632,12 @@ install-binaries:: install-$(BEST) install-tools
 
 install-byte::
 	$(MKDIR) $(FULLBINDIR)
-	cp $(COQMKTOP) $(COQC) $(COQTOPBYTE) $(FULLBINDIR)
+	$(INSTALLBIN) $(COQMKTOP) $(COQC) $(COQTOPBYTE) $(FULLBINDIR)
 	cd $(FULLBINDIR); ln -sf coqtop.byte$(EXE) coqtop$(EXE)
 
 install-opt::
 	$(MKDIR) $(FULLBINDIR)
-	cp $(COQMKTOP) $(COQC) $(COQTOPBYTE) $(COQTOPOPT) $(FULLBINDIR)
+	$(INSTALLBIN) $(COQMKTOP) $(COQC) $(COQTOPBYTE) $(COQTOPOPT) $(FULLBINDIR)
 	cd $(FULLBINDIR); ln -sf coqtop.opt$(EXE) coqtop$(EXE)
 
 install-tools::
@@ -645,52 +645,52 @@ install-tools::
 	# recopie des fichiers de style pour coqide
 	$(MKDIR) $(FULLCOQLIB)/tools/coqdoc
 	touch $(FULLCOQLIB)/tools/coqdoc/coqdoc.sty $(FULLCOQLIB)/tools/coqdoc/coqdoc.css # to have the mode according to umask (bug #1715)
-	cp tools/coqdoc/coqdoc.css tools/coqdoc/coqdoc.sty $(FULLCOQLIB)/tools/coqdoc
-	cp $(TOOLS) $(FULLBINDIR)
+	$(INSTALLLIB) tools/coqdoc/coqdoc.css tools/coqdoc/coqdoc.sty $(FULLCOQLIB)/tools/coqdoc
+	$(INSTALLBIN) $(TOOLS) $(FULLBINDIR)
 
 install-library:
 	$(MKDIR) $(FULLCOQLIB)
 	for f in $(LIBFILES); do \
 	  $(MKDIR) $(FULLCOQLIB)/`dirname $$f`; \
-	  cp $$f $(FULLCOQLIB)/`dirname $$f`; \
+	  $(INSTALLLIB) $$f $(FULLCOQLIB)/`dirname $$f`; \
         done
 	$(MKDIR) $(FULLCOQLIB)/states
-	cp states/*.coq $(FULLCOQLIB)/states
+	$(INSTALLLIB) states/*.coq $(FULLCOQLIB)/states
 	$(MKDIR) $(FULLCOQLIB)/user-contrib
-	cp $(LINKCMO) $(LINKCMX) $(GRAMMARCMA) $(FULLCOQLIB)
-	find . -name \*.cmi -exec cp {} $(FULLCOQLIB) \;
+	$(INSTALLLIB) $(LINKCMO) $(LINKCMX) $(GRAMMARCMA) $(FULLCOQLIB)
+	find . -name \*.cmi -exec $(INSTALLLIB) {} $(FULLCOQLIB) \;
 
 install-library-light:
 	$(MKDIR) $(FULLCOQLIB)
 	for f in $(LIBFILESLIGHT); do \
 	  $(MKDIR) $(FULLCOQLIB)/`dirname $$f`; \
-	  cp $$f $(FULLCOQLIB)/`dirname $$f`; \
+	  $(INSTALLLIB) $$f $(FULLCOQLIB)/`dirname $$f`; \
         done
 	$(MKDIR) $(FULLCOQLIB)/states
-	cp states/*.coq $(FULLCOQLIB)/states
+	$(INSTALLLIB) states/*.coq $(FULLCOQLIB)/states
 
 install-allreals::
 	for f in $(ALLREALS); do \
 	  $(MKDIR) $(FULLCOQLIB)/`dirname $$f`; \
-	  cp $$f $(FULLCOQLIB)/`dirname $$f`; \
+	  $(INSTALLLIB) $$f $(FULLCOQLIB)/`dirname $$f`; \
         done
 
 install-coq-info: install-coq-manpages install-emacs install-latex
 
 install-coq-manpages:
 	$(MKDIR) $(FULLMANDIR)/man1
-	cp $(MANPAGES) $(FULLMANDIR)/man1
+	$(INSTALLLIB) $(MANPAGES) $(FULLMANDIR)/man1
 
 install-emacs:
 	$(MKDIR) $(FULLEMACSLIB)
-	cp tools/coq.el tools/coq-inferior.el $(FULLEMACSLIB)
+	$(INSTALLLIB) tools/coq.el tools/coq-inferior.el $(FULLEMACSLIB)
 
 # command to update TeX' kpathsea database
 #UPDATETEX = $(MKTEXLSR) /usr/share/texmf /var/spool/texmf $(BASETEXDIR) > /dev/null
 
 install-latex:
 	$(MKDIR) $(FULLCOQDOCDIR)
-	cp tools/coqdoc/coqdoc.sty $(FULLCOQDOCDIR)	
+	$(INSTALLLIB) tools/coqdoc/coqdoc.sty $(FULLCOQDOCDIR)	
 #	-$(UPDATETEX)
 
 ###########################################################################
diff --git a/Makefile.common b/Makefile.common
index 7719572f02..3ba85f9a49 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -29,6 +29,10 @@ CHICKENOPT:=bin/coqchk.opt$(EXE)
 BESTCHICKEN:=bin/coqchk.$(BEST)$(EXE)
 CHICKEN:=bin/coqchk$(EXE)
 
+INSTALLBIN:=install
+INSTALLLIB:=install -m 644 
+MKDIR:=install -d
+
 COQIDEBYTE:=bin/coqide.byte$(EXE)
 COQIDEOPT:=bin/coqide.opt$(EXE)
 COQIDE:=bin/coqide$(EXE)
diff --git a/Makefile.doc b/Makefile.doc
index 765aa18454..03fbb88758 100644
--- a/Makefile.doc
+++ b/Makefile.doc
@@ -97,11 +97,11 @@ doc/refman/Reference-Manual.html: doc/refman/headers.hva doc/refman/Reference-Ma
 doc/refman/html/index.html: doc/refman/Reference-Manual.html $(REFMANPNGFILES) \
                         doc/refman/cover.html doc/refman/index.html
 	- rm -rf doc/refman/html
-	mkdir doc/refman/html
-	cp $(REFMANPNGFILES) doc/refman/html
+	$(MKDIR) doc/refman/html
+	$(INSTALLLIB) $(REFMANPNGFILES) doc/refman/html
 	(cd doc/refman/html; hacha -o toc.html ../Reference-Manual.html)
-	cp doc/refman/cover.html doc/refman/menu.html doc/refman/html
-	cp doc/refman/index.html doc/refman/html
+	$(INSTALLLIB) doc/refman/cover.html doc/refman/menu.html doc/refman/html
+	$(INSTALLLIB) doc/refman/index.html doc/refman/html
 
 doc/refman-quick:
 	(cd doc/refman; \
@@ -142,9 +142,9 @@ doc/faq/FAQ.v.html: doc/faq/FAQ.v.dvi # to ensure FAQ.v.bbl
 
 doc/faq/html/index.html: doc/faq/FAQ.v.html
 	- rm -rf doc/faq/html
-	mkdir doc/faq/html
-	cp doc/faq/interval_discr.v doc/faq/axioms.png doc/faq/html
-	cp doc/faq/FAQ.v.html doc/faq/html/index.html
+	$(MKDIR) doc/faq/html
+	$(INSTALLLIB) doc/faq/interval_discr.v doc/faq/axioms.png doc/faq/html
+	$(INSTALLLIB) doc/faq/FAQ.v.html doc/faq/html/index.html
 
 ######################################################################
 # Standard library
@@ -154,7 +154,7 @@ doc/faq/html/index.html: doc/faq/FAQ.v.html
 
 doc/stdlib/index-body.html: $(THEORIESVO:.vo=.glob)
 	- rm -rf doc/stdlib/html
-	mkdir doc/stdlib/html
+	$(MKDIR) doc/stdlib/html
 	$(COQDOC) -q -d doc/stdlib/html --multi-index --html \
 	  -R theories Coq $(THEORIESVO:.vo=.v)
 	mv doc/stdlib/html/index.html doc/stdlib/index-body.html
@@ -215,26 +215,26 @@ ide/index_urls.txt: doc/refman/html/index.html
 install-doc: install-doc-meta install-doc-html install-doc-printable
 
 install-doc-meta:
-	mkdir $(DOCDIR)
-	cp doc/LICENCE $(DOCDIR)/LICENCE.doc
+	$(MKDIR) $(DOCDIR)
+	$(INSTALLLIB) doc/LICENCE $(DOCDIR)/LICENCE.doc
 
 install-doc-html: doc-html
-	mkdir $(DOCDIR)/html
-	cp -r doc/refman/html $(DOCDIR)/html/refman 
-	cp -r doc/stdlib/html $(DOCDIR)/html/stdlib 
-	cp -r doc/RecTutorial/RecTutorial.html $(DOCDIR)/html/
-	cp -r doc/faq/html $(DOCDIR)/html/faq
-	cp -r doc/tutorial/tutorial.html doc/RecTutorial/RecTutorial.html $(DOCDIR)/html/
+	$(MKDIR) $(DOCDIR)/html
+	$(INSTALLLIB) doc/refman/html $(DOCDIR)/html/refman 
+	$(INSTALLLIB) doc/stdlib/html $(DOCDIR)/html/stdlib 
+	$(INSTALLLIB) doc/RecTutorial/RecTutorial.html $(DOCDIR)/html/
+	$(INSTALLLIB) doc/faq/html $(DOCDIR)/html/faq
+	$(INSTALLLIB) doc/tutorial/tutorial.html doc/RecTutorial/RecTutorial.html $(DOCDIR)/html/
 
 install-doc-printable: doc-pdf doc-ps
-	mkdir $(DOCDIR)/ps
-	cp -r doc/refman/Reference-manual.pdf \
+	$(MKDIR) $(DOCDIR)/ps
+	$(INSTALLLIB) doc/refman/Reference-manual.pdf \
 		doc/stdlib/Library.pdf \
 		doc/refman/Reference-manual.ps \
 		doc/stdlib/Library.ps $(DOCDIR)/ps
-	cp -r doc/tutorial/Tutorial.v.pdf $(DOCDIR)/ps/Tutorial.pdf
-	cp -r doc/RecTutorial/RecTutorial.v.pdf $(DOCDIR)/ps/RecTutorial.pdf
-	cp -r doc/faq/FAQ.v.pdf $(DOCDIR)/ps/FAQ.pdf
-	cp -r doc/tutorial/Tutorial.v.ps $(DOCDIR)/ps/Tutorial.ps
-	cp -r doc/RecTutorial/RecTutorial.v.ps $(DOCDIR)/ps/RecTutorial.ps
-	cp -r doc/faq/FAQ.v.ps $(DOCDIR)/ps/FAQ.ps
+	$(INSTALLLIB) doc/tutorial/Tutorial.v.pdf $(DOCDIR)/ps/Tutorial.pdf
+	$(INSTALLLIB) doc/RecTutorial/RecTutorial.v.pdf $(DOCDIR)/ps/RecTutorial.pdf
+	$(INSTALLLIB) doc/faq/FAQ.v.pdf $(DOCDIR)/ps/FAQ.pdf
+	$(INSTALLLIB) doc/tutorial/Tutorial.v.ps $(DOCDIR)/ps/Tutorial.ps
+	$(INSTALLLIB) doc/RecTutorial/RecTutorial.v.ps $(DOCDIR)/ps/RecTutorial.ps
+	$(INSTALLLIB) doc/faq/FAQ.v.ps $(DOCDIR)/ps/FAQ.ps