diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-10-01 21:41:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-10-01 21:41:46 -0700 |
| commit | 7c2738cefb07e6549cafa42d1d383a3bb54ed0f3 (patch) | |
| tree | 8cb6b3d357bd7a7dc419df1bd0aaf350c6fad4c5 /Makefile | |
| parent | 1965efb1599f59b8e3380335d1fa395e2008a30b (diff) | |
| download | git-7c2738cefb07e6549cafa42d1d383a3bb54ed0f3.tar.gz git-7c2738cefb07e6549cafa42d1d383a3bb54ed0f3.tar.xz | |
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>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -215,7 +215,8 @@ BUILT_INS = \ $(patsubst builtin-%.o,git-%$X,$(BUILTIN_OBJS)) # what 'all' will build and 'install' will install, in gitexecdir -ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS) +ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS) \ + git-merge-recur$X # Backward compatibility -- to be removed after 1.0 PROGRAMS += git-ssh-pull$X git-ssh-push$X @@ -586,8 +587,7 @@ export prefix TAR INSTALL DESTDIR SHELL_PATH template_dir ### Build rules -all: $(ALL_PROGRAMS) $(BUILT_INS) git$X gitk gitweb/gitweb.cgi \ - git-merge-recur$X +all: $(ALL_PROGRAMS) $(BUILT_INS) git$X gitk gitweb/gitweb.cgi all: perl/Makefile $(MAKE) -C perl |