diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-04-06 22:21:58 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-04-06 22:21:58 (GMT) |
| commit | 0f0303a479477cfd4f766bdfb955c7f2ebe9227a (patch) | |
| tree | cd635dcbf1f853b4768f10ec94f9c14b4c171eea | |
| parent | faa21c10d44184f616d391c158dcbb13b9c72ef3 (diff) | |
| parent | f2a2876f5a4a9c5250d8f64bd468677d506a956a (diff) | |
| download | git-0f0303a479477cfd4f766bdfb955c7f2ebe9227a.zip git-0f0303a479477cfd4f766bdfb955c7f2ebe9227a.tar.gz git-0f0303a479477cfd4f766bdfb955c7f2ebe9227a.tar.bz2 | |
Merge branch 'ab/make-optim-noop'
A micro fix to a topic earlier merged to 'master'
source: <patch-1.1-05949221e3f-20220319T002715Z-avarab@gmail.com>
* ab/make-optim-noop:
contrib/scalar: fix 'all' target in Makefile
Documentation/Makefile: fix "make info" regression in dad9cd7d518
| -rw-r--r-- | Documentation/Makefile | 2 | ||||
| -rw-r--r-- | contrib/scalar/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/Makefile b/Documentation/Makefile index 1eb9192..44c080e 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -390,7 +390,7 @@ gitman.texi: $(MAN_XML) cat-texi.perl texi.xsl $(RM) $@+ gitman.info: gitman.texi - $(QUIET_MAKEINFO)$(MAKEINFO) --no-split --no-validate $*.texi + $(QUIET_MAKEINFO)$(MAKEINFO) --no-split --no-validate $< $(patsubst %.txt,%.texi,$(MAN_TXT)): %.texi : %.xml $(QUIET_DB2TEXI)$(DOCBOOK2X_TEXI) --to-stdout $*.xml >$@ diff --git a/contrib/scalar/Makefile b/contrib/scalar/Makefile index 5e86d78..37f283f 100644 --- a/contrib/scalar/Makefile +++ b/contrib/scalar/Makefile @@ -11,7 +11,7 @@ include ../../config.mak.uname TARGETS = scalar$(X) scalar.o GITLIBS = ../../common-main.o ../../libgit.a ../../xdiff/lib.a -all: scalar$(X) ../../bin-wrappers/scalar +all:: scalar$(X) ../../bin-wrappers/scalar $(GITLIBS): $(QUIET_SUBDIR0)../.. $(QUIET_SUBDIR1) $(subst ../../,,$@) |