diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-01-17 15:59:44 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-17 15:59:44 -0800 |
| commit | a4c3616b19700cc60e06096f59c4aae0e6635cfe (patch) | |
| tree | d95ff48a0b18053c6ef242c1f39dce0a25c63e28 /Documentation/Makefile | |
| parent | Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge' (diff) | |
| parent | Makefile: consolidate .FORCE-* targets (diff) | |
| download | tgif-a4c3616b19700cc60e06096f59c4aae0e6635cfe.tar.xz | |
Merge branch 'jn/makefile'
* jn/makefile:
Makefile: consolidate .FORCE-* targets
Makefile: learn to generate listings for targets requiring special flags
Makefile: use target-specific variable to pass flags to cc
Makefile: regenerate assembler listings when asked
Diffstat (limited to 'Documentation/Makefile')
| -rw-r--r-- | Documentation/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/Makefile b/Documentation/Makefile index 4797b2dc35..8a8a3954dc 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -204,7 +204,7 @@ install-pdf: pdf install-html: html '$(SHELL_PATH_SQ)' ./install-webdoc.sh $(DESTDIR)$(htmldir) -../GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE +../GIT-VERSION-FILE: FORCE $(QUIET_SUBDIR0)../ $(QUIET_SUBDIR1) GIT-VERSION-FILE -include ../GIT-VERSION-FILE @@ -337,4 +337,4 @@ quick-install-man: quick-install-html: '$(SHELL_PATH_SQ)' ./install-doc-quick.sh $(HTML_REF) $(DESTDIR)$(htmldir) -.PHONY: .FORCE-GIT-VERSION-FILE +.PHONY: FORCE |