Lines 1-21
Link Here
|
1 |
--- Makefile.orig Tue Nov 7 20:47:34 2006 |
1 |
--- Makefile.orig Mon Feb 19 01:58:30 2007 |
2 |
+++ Makefile Tue Nov 7 20:47:55 2006 |
2 |
+++ Makefile Sat Feb 24 18:20:08 2007 |
3 |
@@ -178,7 +178,8 @@ |
3 |
@@ -101,6 +101,10 @@ |
4 |
git-send-email.perl git-svn.perl |
4 |
# Define NO_PERL_MAKEMAKER if you cannot use Makefiles generated by perl's |
|
|
5 |
# MakeMaker (e.g. using ActiveState under Cygwin). |
6 |
# |
7 |
+# Define NO_GUI if you do not want Tcl/Tk GUI. |
8 |
+# |
9 |
+# Define WITH_P4IMPORT to build and install Python git-p4import script. |
10 |
+# |
5 |
|
11 |
|
6 |
SCRIPT_PYTHON = \ |
12 |
GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE |
7 |
- git-merge-recursive-old.py |
13 |
@$(SHELL_PATH) ./GIT-VERSION-GEN |
8 |
+ git-merge-recursive-old.py \ |
14 |
@@ -186,9 +190,19 @@ |
9 |
+ git-p4import.py |
15 |
git-svnimport.perl git-cvsexportcommit.perl \ |
|
|
16 |
git-send-email.perl git-svn.perl |
10 |
|
17 |
|
|
|
18 |
+SCRIPT_PYTHON = \ |
19 |
+ git-p4import.py |
20 |
+ |
21 |
+ifdef WITH_P4IMPORT |
22 |
+SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \ |
23 |
+ $(patsubst %.perl,%,$(SCRIPT_PERL)) \ |
24 |
+ $(patsubst %.py,%,$(SCRIPT_PYTHON)) \ |
25 |
+ git-cherry-pick git-status git-instaweb |
26 |
+else |
11 |
SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \ |
27 |
SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \ |
12 |
$(patsubst %.perl,%,$(SCRIPT_PERL)) \ |
28 |
$(patsubst %.perl,%,$(SCRIPT_PERL)) \ |
13 |
@@ -823,7 +824,7 @@ |
29 |
git-cherry-pick git-status git-instaweb |
14 |
$(INSTALL) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexecdir_SQ)' |
30 |
+endif |
|
|
31 |
|
32 |
# ... and all the rest that could be moved out of bindir to gitexecdir |
33 |
PROGRAMS = \ |
34 |
@@ -231,6 +245,9 @@ |
35 |
ifndef PERL_PATH |
36 |
PERL_PATH = /usr/bin/perl |
37 |
endif |
38 |
+ifndef PYTHON_PATH |
39 |
+ PYTHON_PATH = /usr/local/bin/python |
40 |
+endif |
41 |
|
42 |
export PERL_PATH |
43 |
|
44 |
@@ -593,6 +610,7 @@ |
45 |
|
46 |
SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH)) |
47 |
PERL_PATH_SQ = $(subst ','\'',$(PERL_PATH)) |
48 |
+PYTHON_PATH_SQ = $(subst ','\'',$(PYTHON_PATH)) |
49 |
|
50 |
LIBS = $(GITLIBS) $(EXTLIBS) |
51 |
|
52 |
@@ -613,7 +631,9 @@ |
53 |
endif |
54 |
|
55 |
all:: |
56 |
+ifndef NO_GUI |
57 |
$(MAKE) -C git-gui all |
58 |
+endif |
59 |
$(MAKE) -C perl PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' all |
60 |
$(MAKE) -C templates |
61 |
|
62 |
@@ -646,6 +666,15 @@ |
63 |
|
64 |
$(patsubst %.perl,%,$(SCRIPT_PERL)): perl/perl.mak |
65 |
|
66 |
+$(patsubst %.py,%,$(SCRIPT_PYTHON)) : % : %.py |
67 |
+ rm -f $@ $@+ |
68 |
+ sed -e '1s|#!.*/python|#!$(PYTHON_PATH_SQ)|' \ |
69 |
+ -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \ |
70 |
+ -e 's/@@NO_CURL@@/$(NO_CURL)/g' \ |
71 |
+ $@.py >$@+ |
72 |
+ chmod +x $@+ |
73 |
+ mv $@+ $@ |
74 |
+ |
75 |
perl/perl.mak: GIT-CFLAGS |
76 |
$(MAKE) -C perl PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' $(@F) |
77 |
|
78 |
@@ -844,7 +873,9 @@ |
15 |
$(INSTALL) git$X gitk '$(DESTDIR_SQ)$(bindir_SQ)' |
79 |
$(INSTALL) git$X gitk '$(DESTDIR_SQ)$(bindir_SQ)' |
16 |
$(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install |
80 |
$(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install |
17 |
- $(MAKE) -C perl install |
81 |
$(MAKE) -C perl prefix='$(prefix_SQ)' install |
18 |
+ $(MAKE) -C perl pure_install |
82 |
+ifndef NO_GUI |
19 |
$(INSTALL) -d -m755 '$(DESTDIR_SQ)$(GIT_PYTHON_DIR_SQ)' |
83 |
$(MAKE) -C git-gui install |
20 |
$(INSTALL) $(PYMODULES) '$(DESTDIR_SQ)$(GIT_PYTHON_DIR_SQ)' |
84 |
+endif |
21 |
if test 'z$(bindir_SQ)' != 'z$(gitexecdir_SQ)'; \ |
85 |
if test 'z$(bindir_SQ)' != 'z$(gitexecdir_SQ)'; \ |
|
|
86 |
then \ |
87 |
ln -f '$(DESTDIR_SQ)$(bindir_SQ)/git$X' \ |
88 |
@@ -878,11 +909,19 @@ |
89 |
@mkdir -p $(GIT_TARNAME) |
90 |
@cp git.spec $(GIT_TARNAME) |
91 |
@echo $(GIT_VERSION) > $(GIT_TARNAME)/version |
92 |
+ifndef NO_GUI |
93 |
@$(MAKE) -C git-gui TARDIR=../$(GIT_TARNAME)/git-gui dist-version |
94 |
+endif |
95 |
+ifndef NO_GUI |
96 |
$(TAR) rf $(GIT_TARNAME).tar \ |
97 |
$(GIT_TARNAME)/git.spec \ |
98 |
$(GIT_TARNAME)/version \ |
99 |
$(GIT_TARNAME)/git-gui/version |
100 |
+else |
101 |
+ $(TAR) rf $(GIT_TARNAME).tar \ |
102 |
+ $(GIT_TARNAME)/git.spec \ |
103 |
+ $(GIT_TARNAME)/version |
104 |
+endif |
105 |
@rm -rf $(GIT_TARNAME) |
106 |
gzip -f -9 $(GIT_TARNAME).tar |
107 |
|
108 |
@@ -923,7 +962,9 @@ |
109 |
rm -f gitweb/gitweb.cgi |
110 |
$(MAKE) -C Documentation/ clean |
111 |
$(MAKE) -C perl clean |
112 |
+ifndef NO_GUI |
113 |
$(MAKE) -C git-gui clean |
114 |
+endif |
115 |
$(MAKE) -C templates/ clean |
116 |
$(MAKE) -C t/ clean |
117 |
rm -f GIT-VERSION-FILE GIT-CFLAGS |