Skip to content

Commit 0f0303a

Browse files
committed
Merge branch 'ab/make-optim-noop'
A micro fix to a topic earlier merged to 'master' source: <[email protected]> * ab/make-optim-noop: contrib/scalar: fix 'all' target in Makefile Documentation/Makefile: fix "make info" regression in dad9cd7
2 parents faa21c1 + f2a2876 commit 0f0303a

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Documentation/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@ gitman.texi: $(MAN_XML) cat-texi.perl texi.xsl
390390
$(RM) $@+
391391

392392
gitman.info: gitman.texi
393-
$(QUIET_MAKEINFO)$(MAKEINFO) --no-split --no-validate $*.texi
393+
$(QUIET_MAKEINFO)$(MAKEINFO) --no-split --no-validate $<
394394

395395
$(patsubst %.txt,%.texi,$(MAN_TXT)): %.texi : %.xml
396396
$(QUIET_DB2TEXI)$(DOCBOOK2X_TEXI) --to-stdout $*.xml >$@

contrib/scalar/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ include ../../config.mak.uname
1111
TARGETS = scalar$(X) scalar.o
1212
GITLIBS = ../../common-main.o ../../libgit.a ../../xdiff/lib.a
1313

14-
all: scalar$(X) ../../bin-wrappers/scalar
14+
all:: scalar$(X) ../../bin-wrappers/scalar
1515

1616
$(GITLIBS):
1717
$(QUIET_SUBDIR0)../.. $(QUIET_SUBDIR1) $(subst ../../,,$@)

0 commit comments

Comments
 (0)