Skip to content

Commit f94fbbe

Browse files
author
Junio C Hamano
committed
Retire git-log.sh (take #3)
Do not install built-in commands as separate files -- use hardlinks instead. Signed-off-by: Junio C Hamano <junkio@cox.net>
1 parent 944e3a8 commit f94fbbe

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ PROGRAMS = \
170170
BUILT_INS = git-log$X
171171

172172
# what 'all' will build and 'install' will install, in gitexecdir
173-
ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(BUILT_INS) $(SCRIPTS)
173+
ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS)
174174

175175
# Backward compatibility -- to be removed after 1.0
176176
PROGRAMS += git-ssh-pull$X git-ssh-push$X
@@ -450,7 +450,7 @@ LIB_OBJS += $(COMPAT_OBJS)
450450
export prefix TAR INSTALL DESTDIR SHELL_PATH template_dir
451451
### Build rules
452452

453-
all: $(ALL_PROGRAMS) git$X gitk
453+
all: $(ALL_PROGRAMS) $(BUILT_INS) git$X gitk
454454

455455
all:
456456
$(MAKE) -C templates
@@ -617,6 +617,7 @@ install: all
617617
$(MAKE) -C templates install
618618
$(INSTALL) -d -m755 '$(DESTDIR_SQ)$(GIT_PYTHON_DIR_SQ)'
619619
$(INSTALL) $(PYMODULES) '$(DESTDIR_SQ)$(GIT_PYTHON_DIR_SQ)'
620+
$(foreach p,$(BUILT_INS), rm -f '$(DESTDIR_SQ)$(bindir_SQ)/$p' && ln '$(DESTDIR_SQ)$(bindir_SQ)/git$X' '$(DESTDIR_SQ)$(bindir_SQ)/$p' ;)
620621

621622
install-doc:
622623
$(MAKE) -C Documentation install

0 commit comments

Comments
 (0)