diff options
| author |  Enrico Tassi <Enrico.Tassi@inria.fr> | 2017-05-10 10:29:51 +0200 |
|---|---|---|
| committer | Enrico Tassi <Enrico.Tassi@inria.fr> | 2017-05-23 10:48:28 +0200 |
| commit | 8bec0d32f038819de0503d9045daefcf1e253d49 (patch) | |
| tree | 7ca4d3abf827e98c4d256a523f5d7d2378a02087 /tools | |
| parent | 4ae2b3a21b6493d4e79d80880f6bfd29734445b9 (diff) | |
Make install a single colon target for retro compatibility
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/CoqMakefile.in | 7 | ||||
| -rw-r--r-- | tools/coq_makefile.ml | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/tools/CoqMakefile.in b/tools/CoqMakefile.in index 0145dd51f..a0cf4b02b 100644 --- a/tools/CoqMakefile.in +++ b/tools/CoqMakefile.in @@ -333,8 +333,7 @@ beautify: $(BEAUTYFILES) # There rules can be extended in @LOCAL_FILE@ # Extensions can't assume when they run. -install:: - @# Extension point +install: install-extra $(HIDE)for f in $(FILESTOINSTALL); do\ df="`$(COQMF_MAKEFILE) -destination-of "$$f" $(COQLIBS)`";\ if [ -z "$$df" ]; then\ @@ -345,7 +344,9 @@ install:: echo INSTALL "$$f" "$(DESTDIR)$(COQLIBINSTALL)/$$df";\ fi;\ done -.PHONY: install +install-extra:: + @# Extension point +.PHONY: install install-extra install-doc:: html mlihtml @# Extension point diff --git a/tools/coq_makefile.ml b/tools/coq_makefile.ml index 1c7a57960..39dccadde 100644 --- a/tools/coq_makefile.ml +++ b/tools/coq_makefile.ml @@ -181,7 +181,7 @@ let generate_conf_subdirs oc sds = List.iter (fprintf oc "post-all::\n\tcd \"%s\" && $(MAKE) all\n") sds; List.iter (fprintf oc "clean::\n\tcd \"%s\" && $(MAKE) clean\n") sds; List.iter (fprintf oc "archclean::\n\tcd \"%s\" && $(MAKE) archclean\n") sds; - List.iter (fprintf oc "install::\n\tcd \"%s\" && $(MAKE) install\n") sds + List.iter (fprintf oc "install-extra::\n\tcd \"%s\" && $(MAKE) install\n") sds let generate_conf_includes oc { ml_includes; r_includes; q_includes } = |