diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-12-18 02:06:40 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-12-18 02:06:40 +0300 |
| commit | f0c592dcfd736060354426e3994fb110d33a8c46 (patch) | |
| tree | ce6ebe749289e3e48c444e1938b2c0aad610b131 /Documentation | |
| parent | 689010ca3ce5f277b1e4f98a31193bc7adbaf606 (diff) | |
| parent | c5312033dd81771def2268d57f64e5551d9e11bf (diff) | |
Merge branch 'rj/make-clean'
Build optimization.
* rj/make-clean:
Makefile: don't use a versioned temp distribution directory
Makefile: don't try to clean old debian build product
gitweb/Makefile: conditionally include ../GIT-VERSION-FILE
Documentation/Makefile: conditionally include ../GIT-VERSION-FILE
Documentation/Makefile: conditionally include doc.dep
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/Makefile b/Documentation/Makefile index 69dbe4bb0b..b980407059 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -272,7 +272,9 @@ install-html: html ../GIT-VERSION-FILE: FORCE $(QUIET_SUBDIR0)../ $(QUIET_SUBDIR1) GIT-VERSION-FILE +ifneq ($(MAKECMDGOALS),clean) -include ../GIT-VERSION-FILE +endif # # Determine "include::" file references in asciidoc files. @@ -286,7 +288,9 @@ doc.dep : $(docdep_prereqs) $(wildcard *.txt) $(wildcard config/*.txt) build-doc $(PERL_PATH) ./build-docdep.perl >$@+ $(QUIET_STDERR) && \ mv $@+ $@ +ifneq ($(MAKECMDGOALS),clean) -include doc.dep +endif cmds_txt = cmds-ancillaryinterrogators.txt \ cmds-ancillarymanipulators.txt \ |