projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Document git-grep and link it from the main git(7) page.
[git.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
41461fa
..
9c2bdd6
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-48,6
+48,7
@@
ALL_CFLAGS = $(CFLAGS) $(PLATFORM_DEFINES) $(DEFINES)
prefix = $(HOME)
bindir = $(prefix)/bin
template_dir = $(prefix)/share/git-core/templates/
prefix = $(HOME)
bindir = $(prefix)/bin
template_dir = $(prefix)/share/git-core/templates/
+GIT_PYTHON_DIR = $(prefix)/share/git-core/python
# DESTDIR=
CC = gcc
# DESTDIR=
CC = gcc
@@
-75,12
+76,15
@@
SCRIPT_SH = \
git-tag.sh git-verify-tag.sh git-whatchanged.sh git.sh \
git-applymbox.sh git-applypatch.sh \
git-merge.sh git-merge-stupid.sh git-merge-octopus.sh \
git-tag.sh git-verify-tag.sh git-whatchanged.sh git.sh \
git-applymbox.sh git-applypatch.sh \
git-merge.sh git-merge-stupid.sh git-merge-octopus.sh \
- git-merge-resolve.sh
+ git-merge-resolve.sh
git-grep.sh
SCRIPT_PERL = \
git-archimport.perl git-cvsimport.perl git-relink.perl \
git-rename.perl git-shortlog.perl
SCRIPT_PERL = \
git-archimport.perl git-cvsimport.perl git-relink.perl \
git-rename.perl git-shortlog.perl
+SCRIPT_PYTHON = \
+ git-merge-fredrik.py
+
# The ones that do not have to link with lcrypto nor lz.
SIMPLE_PROGRAMS = \
git-get-tar-commit-id git-mailinfo git-mailsplit git-stripspace \
# The ones that do not have to link with lcrypto nor lz.
SIMPLE_PROGRAMS = \
git-get-tar-commit-id git-mailinfo git-mailsplit git-stripspace \
@@
-105,6
+109,9
@@
PROGRAMS = \
git-upload-pack git-verify-pack git-write-tree \
$(SIMPLE_PROGRAMS)
git-upload-pack git-verify-pack git-write-tree \
$(SIMPLE_PROGRAMS)
+PYMODULES = \
+ gitMergeCommon.py
+
ifdef WITH_SEND_EMAIL
SCRIPT_PERL += git-send-email.perl
endif
ifdef WITH_SEND_EMAIL
SCRIPT_PERL += git-send-email.perl
endif
@@
-150,6
+157,9
@@
endif
ifndef PERL_PATH
PERL_PATH = /usr/bin/perl
endif
ifndef PERL_PATH
PERL_PATH = /usr/bin/perl
endif
+ifndef PYTHON_PATH
+ PYTHON_PATH = /usr/bin/python
+endif
ifndef NO_OPENSSL
LIB_OBJS += epoch.o
ifndef NO_OPENSSL
LIB_OBJS += epoch.o
@@
-189,7
+199,9
@@
endif
DEFINES += '-DSHA1_HEADER=$(SHA1_HEADER)'
SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \
DEFINES += '-DSHA1_HEADER=$(SHA1_HEADER)'
SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \
- $(patsubst %.perl,%,$(SCRIPT_PERL)) gitk
+ $(patsubst %.perl,%,$(SCRIPT_PERL)) \
+ $(patsubst %.py,%,$(SCRIPT_PYTHON)) \
+ gitk
### Build rules
### Build rules
@@
-214,6
+226,13
@@
$(patsubst %.perl,%,$(SCRIPT_PERL)) : % : %.perl
sed -e '1s|#!.*perl|#!$(PERL_PATH)|' $@.perl >$@
chmod +x $@
sed -e '1s|#!.*perl|#!$(PERL_PATH)|' $@.perl >$@
chmod +x $@
+$(patsubst %.py,%,$(SCRIPT_PYTHON)) : % : %.py
+ rm -f $@
+ sed -e '1s|#!.*python|#!$(PYTHON_PATH)|' \
+ -e 's|@@GIT_PYTHON_PATH@@|$(GIT_PYTHON_DIR)|g' \
+ $@.py >$@
+ chmod +x $@
+
%.o: %.c
$(CC) -o $*.o -c $(ALL_CFLAGS) $<
%.o: %.S
%.o: %.c
$(CC) -o $*.o -c $(ALL_CFLAGS) $<
%.o: %.S
@@
-274,6
+293,8
@@
install: $(PROGRAMS) $(SCRIPTS)
$(INSTALL) git-revert $(DESTDIR)$(bindir)/git-cherry-pick
sh ./cmd-rename.sh $(DESTDIR)$(bindir)
$(MAKE) -C templates install
$(INSTALL) git-revert $(DESTDIR)$(bindir)/git-cherry-pick
sh ./cmd-rename.sh $(DESTDIR)$(bindir)
$(MAKE) -C templates install
+ $(INSTALL) -m755 -d $(DESTDIR)$(GIT_PYTHON_DIR)
+ $(INSTALL) $(PYMODULES) $(DESTDIR)$(GIT_PYTHON_DIR)
install-doc:
$(MAKE) -C Documentation install
install-doc:
$(MAKE) -C Documentation install