@matheusbsbs / matheus-bagliano / commits / 7878b383d6
Fork 0

Add the WITH_P4IMPORT knob to the Makefile.

WITH_P4IMPORT: enables the installation of the Perforce import script. Signed-off-by: Eygene Ryabinkin <rea-git@codelabs.ru> Signed-off-by: Junio C Hamano <junkio@cox.net>

Eygene Ryabinkin committed Mar 27, 2007 at 14:26 UTC 7878b383d6c87824d7c33fa5bfcd0c38aa3f51f5
1 file changed +26
Makefile
+26
@@ -110,6 +110,8 @@ all::
110 # Define NO_PERL_MAKEMAKER if you cannot use Makefiles generated by perl's
111 # MakeMaker (e.g. using ActiveState under Cygwin).
112 #
113 +# Define WITH_P4IMPORT to build and install Python git-p4import script.
114 +#
115
116 GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
117 @$(SHELL_PATH) ./GIT-VERSION-GEN
@@ -196,9 +198,20 @@ SCRIPT_PERL = \
198 git-svnimport.perl git-cvsexportcommit.perl \
199 git-send-email.perl git-svn.perl
200
201 +SCRIPT_PYTHON = \
202 + git-p4import.py
203 +
204 +ifdef WITH_P4IMPORT
205 SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \
206 $(patsubst %.perl,%,$(SCRIPT_PERL)) \
207 + $(patsubst %.py,%,$(SCRIPT_PYTHON)) \
208 git-status git-instaweb
209 +else
210 +SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \
211 + $(patsubst %.perl,%,$(SCRIPT_PERL)) \
212 + git-status git-instaweb
213 +endif
214 +
215
216 # ... and all the rest that could be moved out of bindir to gitexecdir
217 PROGRAMS = \
@@ -241,6 +254,9 @@ endif
254 ifndef PERL_PATH
255 PERL_PATH = /usr/bin/perl
256 endif
257 +ifndef PYTHON_PATH
258 + PYTHON_PATH = /usr/local/bin/python
259 +endif
260
261 export PERL_PATH
262
@@ -646,6 +662,7 @@ prefix_SQ = $(subst ','\'',$(prefix))
662
663 SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
664 PERL_PATH_SQ = $(subst ','\'',$(PERL_PATH))
665 +PYTHON_PATH_SQ = $(subst ','\'',$(PYTHON_PATH))
666
667 LIBS = $(GITLIBS) $(EXTLIBS)
668
@@ -699,6 +716,15 @@ $(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh
716
717 $(patsubst %.perl,%,$(SCRIPT_PERL)): perl/perl.mak
718
719 +$(patsubst %.py,%,$(SCRIPT_PYTHON)) : % : %.py
720 + rm -f $@ $@+
721 + sed -e '1s|#!.*/python|#!$(PYTHON_PATH_SQ)|' \
722 + -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
723 + -e 's/@@NO_CURL@@/$(NO_CURL)/g' \
724 + $@.py >$@+
725 + chmod +x $@+
726 + mv $@+ $@
727 +
728 perl/perl.mak: GIT-CFLAGS
729 $(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' $(@F)
730