@matheusbsbs / matheus-bagliano / commits / f979492354
Fork 0

Remove "WITH_P4IMPORT" knob from the Makefile

Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Sean committed Jul 15, 2007 at 15:49 UTC f97949235470920578dff360f100e848894f73d4
1 file changed -26
Makefile
-26
@@ -112,8 +112,6 @@ all::
112 # Define NO_PERL_MAKEMAKER if you cannot use Makefiles generated by perl's
113 # MakeMaker (e.g. using ActiveState under Cygwin).
114 #
115 -# Define WITH_P4IMPORT to build and install Python git-p4import script.
116 -#
115 # Define NO_TCLTK if you do not want Tcl/Tk GUI.
116 #
117 # The TCL_PATH variable governs the location of the Tcl interpreter
@@ -223,20 +221,9 @@ SCRIPT_PERL = \
221 git-svnimport.perl git-cvsexportcommit.perl \
222 git-send-email.perl git-svn.perl
223
226 -SCRIPT_PYTHON = \
227 - git-p4import.py
228 -
229 -ifdef WITH_P4IMPORT
224 SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \
225 $(patsubst %.perl,%,$(SCRIPT_PERL)) \
232 - $(patsubst %.py,%,$(SCRIPT_PYTHON)) \
226 git-status git-instaweb
234 -else
235 -SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \
236 - $(patsubst %.perl,%,$(SCRIPT_PERL)) \
237 - git-status git-instaweb
238 -endif
239 -
227
228 # ... and all the rest that could be moved out of bindir to gitexecdir
229 PROGRAMS = \
@@ -286,9 +273,6 @@ endif
273 ifndef PERL_PATH
274 PERL_PATH = /usr/bin/perl
275 endif
289 -ifndef PYTHON_PATH
290 - PYTHON_PATH = /usr/local/bin/python
291 -endif
276
277 export PERL_PATH
278
@@ -711,7 +695,6 @@ prefix_SQ = $(subst ','\'',$(prefix))
695
696 SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
697 PERL_PATH_SQ = $(subst ','\'',$(PERL_PATH))
714 -PYTHON_PATH_SQ = $(subst ','\'',$(PYTHON_PATH))
698 TCLTK_PATH_SQ = $(subst ','\'',$(TCLTK_PATH))
699
700 LIBS = $(GITLIBS) $(EXTLIBS)
@@ -782,15 +765,6 @@ $(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh
765
766 $(patsubst %.perl,%,$(SCRIPT_PERL)): perl/perl.mak
767
785 -$(patsubst %.py,%,$(SCRIPT_PYTHON)) : % : %.py
786 - $(RM) $@ $@+
787 - sed -e '1s|#!.*/python|#!$(PYTHON_PATH_SQ)|' \
788 - -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
789 - -e 's/@@NO_CURL@@/$(NO_CURL)/g' \
790 - $@.py >$@+
791 - chmod +x $@+
792 - mv $@+ $@
793 -
768 perl/perl.mak: GIT-CFLAGS
769 $(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' $(@F)
770