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

Install git-send-email by default

After 567ffeb7722eefab3991cb894c96548b92b57cc2 and 4bc87a28be020a6bf7387161c65ea3d8e4a0228b, git-send-email no longer requires any non-standard Perl modules, so there's no reason to special-case it. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>

Eric Wong committed May 14, 2006 at 19:26 UTC f3dd5eae58cf3d0d944604af4c71a7043d5368fd
2 files changed +4 -7
Makefile
+2 -5
@@ -131,7 +131,8 @@ SCRIPT_PERL = \
131 git-archimport.perl git-cvsimport.perl git-relink.perl \
132 git-shortlog.perl git-fmt-merge-msg.perl git-rerere.perl \
133 git-annotate.perl git-cvsserver.perl \
134 - git-svnimport.perl git-mv.perl git-cvsexportcommit.perl
134 + git-svnimport.perl git-mv.perl git-cvsexportcommit.perl \
135 + git-send-email.perl
136
137 SCRIPT_PYTHON = \
138 git-merge-recursive.py
@@ -317,10 +318,6 @@ else
318 endif
319 endif
320
320 -ifdef WITH_SEND_EMAIL
321 - SCRIPT_PERL += git-send-email.perl
322 -endif
323 -
321 ifndef NO_CURL
322 ifdef CURLDIR
323 # This is still problematic -- gcc does not always want -R.
git.spec.in
+2 -2
@@ -74,12 +74,12 @@ Git revision tree visualiser ('gitk')
74 %setup -q
75
76 %build
77 -make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" WITH_OWN_SUBPROCESS_PY=YesPlease WITH_SEND_EMAIL=1 \
77 +make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" WITH_OWN_SUBPROCESS_PY=YesPlease \
78 prefix=%{_prefix} all %{!?_without_docs: doc}
79
80 %install
81 rm -rf $RPM_BUILD_ROOT
82 -make %{_smp_mflags} DESTDIR=$RPM_BUILD_ROOT WITH_OWN_SUBPROCESS_PY=YesPlease WITH_SEND_EMAIL=1 \
82 +make %{_smp_mflags} DESTDIR=$RPM_BUILD_ROOT WITH_OWN_SUBPROCESS_PY=YesPlease \
83 prefix=%{_prefix} mandir=%{_mandir} \
84 install %{!?_without_docs: install-doc}
85