diff options
| author | Sean <seanlkml@sympatico.ca> | 2007-07-15 15:49:33 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-07-15 15:23:36 -0700 |
| commit | f97949235470920578dff360f100e848894f73d4 (patch) | |
| tree | aa84a43e5858b54fb3653dc4182a0258c6458644 | |
| parent | a5e407988b35b7353bd03c770afc647670c25981 (diff) | |
| download | git-f97949235470920578dff360f100e848894f73d4.tar.gz git-f97949235470920578dff360f100e848894f73d4.tar.xz | |
Remove "WITH_P4IMPORT" knob from the Makefile
Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Makefile | 26 |
1 files changed, 0 insertions, 26 deletions
@@ -112,8 +112,6 @@ all:: # Define NO_PERL_MAKEMAKER if you cannot use Makefiles generated by perl's # MakeMaker (e.g. using ActiveState under Cygwin). # -# Define WITH_P4IMPORT to build and install Python git-p4import script. -# # Define NO_TCLTK if you do not want Tcl/Tk GUI. # # The TCL_PATH variable governs the location of the Tcl interpreter @@ -223,20 +221,9 @@ SCRIPT_PERL = \ git-svnimport.perl git-cvsexportcommit.perl \ git-send-email.perl git-svn.perl -SCRIPT_PYTHON = \ - git-p4import.py - -ifdef WITH_P4IMPORT SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \ $(patsubst %.perl,%,$(SCRIPT_PERL)) \ - $(patsubst %.py,%,$(SCRIPT_PYTHON)) \ git-status git-instaweb -else -SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \ - $(patsubst %.perl,%,$(SCRIPT_PERL)) \ - git-status git-instaweb -endif - # ... and all the rest that could be moved out of bindir to gitexecdir PROGRAMS = \ @@ -286,9 +273,6 @@ endif ifndef PERL_PATH PERL_PATH = /usr/bin/perl endif -ifndef PYTHON_PATH - PYTHON_PATH = /usr/local/bin/python -endif export PERL_PATH @@ -711,7 +695,6 @@ prefix_SQ = $(subst ','\'',$(prefix)) SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH)) PERL_PATH_SQ = $(subst ','\'',$(PERL_PATH)) -PYTHON_PATH_SQ = $(subst ','\'',$(PYTHON_PATH)) TCLTK_PATH_SQ = $(subst ','\'',$(TCLTK_PATH)) LIBS = $(GITLIBS) $(EXTLIBS) @@ -782,15 +765,6 @@ $(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh $(patsubst %.perl,%,$(SCRIPT_PERL)): perl/perl.mak -$(patsubst %.py,%,$(SCRIPT_PYTHON)) : % : %.py - $(RM) $@ $@+ - sed -e '1s|#!.*/python|#!$(PYTHON_PATH_SQ)|' \ - -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \ - -e 's/@@NO_CURL@@/$(NO_CURL)/g' \ - $@.py >$@+ - chmod +x $@+ - mv $@+ $@ - perl/perl.mak: GIT-CFLAGS $(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' $(@F) |