@matheusbsbs / matheus-bagliano / commits / 7c2738cefb
Fork 0

Makefile: install and clean merge-recur, still.

We advertised git-merge-recur for some time, and we planned to support it for one release after we made it the 'recursive'. However we forgot to install it nor have "make clean" clean it. Signed-off-by: Junio C Hamano <junkio@cox.net>

Junio C Hamano committed Oct 1, 2006 at 21:41 UTC 7c2738cefb07e6549cafa42d1d383a3bb54ed0f3
1 file changed +3 -3
Makefile
+3 -3
@@ -215,7 +215,8 @@ BUILT_INS = \
215 $(patsubst builtin-%.o,git-%$X,$(BUILTIN_OBJS))
216
217 # what 'all' will build and 'install' will install, in gitexecdir
218 -ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS)
218 +ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS) \
219 + git-merge-recur$X
220
221 # Backward compatibility -- to be removed after 1.0
222 PROGRAMS += git-ssh-pull$X git-ssh-push$X
@@ -586,8 +587,7 @@ export prefix TAR INSTALL DESTDIR SHELL_PATH template_dir
587
588 ### Build rules
589
589 -all: $(ALL_PROGRAMS) $(BUILT_INS) git$X gitk gitweb/gitweb.cgi \
590 - git-merge-recur$X
590 +all: $(ALL_PROGRAMS) $(BUILT_INS) git$X gitk gitweb/gitweb.cgi
591
592 all: perl/Makefile
593 $(MAKE) -C perl