Fix the installation location.
The earlier change to separate $(gitexecdir) from $(bindir) had the installation location of the git wrapper and the rest of the commands the wrong way (right now, both of them point at the same location so there is no real harm). Also gitk needs to be installed in $(bindir). Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano committed
Jan 12, 2006 at 21:37 UTC
b42934d611054400de86e559577b421677b3f1ae
1 file changed
+7
-8
Makefile
+7
-8
@@ -114,14 +114,14 @@ SCRIPT_PYTHON = \
114
SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \
115
$(patsubst %.perl,%,$(SCRIPT_PERL)) \
116
$(patsubst %.py,%,$(SCRIPT_PYTHON)) \
117
- gitk git-cherry-pick
117
+ git-cherry-pick
118
119
# The ones that do not have to link with lcrypto nor lz.
120
SIMPLE_PROGRAMS = \
121
git-get-tar-commit-id$X git-mailinfo$X git-mailsplit$X \
122
git-stripspace$X git-daemon$X
123
124
-# ... and all the rest
124
+# ... and all the rest that could be moved out of bindir to gitexecdir
125
PROGRAMS = \
126
git-apply$X git-cat-file$X \
127
git-checkout-index$X git-clone-pack$X git-commit-tree$X \
@@ -142,7 +142,7 @@ PROGRAMS = \
142
git-name-rev$X git-pack-redundant$X git-repo-config$X git-var$X \
143
git-describe$X
144
145
-# what 'all' will build and 'install' will install.
145
+# what 'all' will build and 'install' will install, in gitexecdir
146
ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS)
147
148
# Backward compatibility -- to be removed after 1.0
@@ -368,7 +368,7 @@ LIB_OBJS += $(COMPAT_OBJS)
368
export prefix TAR INSTALL DESTDIR SHELL_PATH template_dir
369
### Build rules
370
371
-all: $(ALL_PROGRAMS) git$X
371
+all: $(ALL_PROGRAMS) git$X gitk
372
373
all:
374
$(MAKE) -C templates
@@ -476,8 +476,8 @@ check:
476
install: all
477
$(INSTALL) -d -m755 $(call shellquote,$(DESTDIR)$(bindir))
478
$(INSTALL) -d -m755 $(call shellquote,$(DESTDIR)$(gitexecdir))
479
- $(INSTALL) $(ALL_PROGRAMS) $(call shellquote,$(DESTDIR)$(bindir))
480
- $(INSTALL) git$X $(call shellquote,$(DESTDIR)$(gitexecdir))
479
+ $(INSTALL) $(ALL_PROGRAMS) $(call shellquote,$(DESTDIR)$(gitexecdir))
480
+ $(INSTALL) git$X gitk $(call shellquote,$(DESTDIR)$(bindir))
481
$(MAKE) -C templates install
482
$(INSTALL) -d -m755 $(call shellquote,$(DESTDIR)$(GIT_PYTHON_DIR))
483
$(INSTALL) $(PYMODULES) $(call shellquote,$(DESTDIR)$(GIT_PYTHON_DIR))
@@ -511,8 +511,7 @@ rpm: dist
511
512
clean:
513
rm -f *.o mozilla-sha1/*.o arm/*.o ppc/*.o compat/*.o $(LIB_FILE)
514
- rm -f $(PROGRAMS) $(SIMPLE_PROGRAMS) git$X
515
- rm -f $(filter-out gitk,$(SCRIPTS))
514
+ rm -f $(ALL_PROGRAMS) git$X
515
rm -f *.spec *.pyc *.pyo */*.pyc */*.pyo
516
rm -rf $(GIT_TARNAME)
517
rm -f $(GIT_TARNAME).tar.gz git-core_$(GIT_VERSION)-*.tar.gz