summaryrefslogtreecommitdiff
path: root/git.spec.in
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-04-24 07:08:16 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-04-24 07:08:16 (GMT)
commit520d7e278cfd25057e883575060b7378dfab61dc (patch)
tree3f20d1056ba4a3e1de652e25d32f2736395a8e2b /git.spec.in
parentafb5f39e24eadc5933b34cfd17c1089e482d6a6b (diff)
parent41728d69426dd707d4978929f8f4ac7a16f115f3 (diff)
downloadgit-520d7e278cfd25057e883575060b7378dfab61dc.zip
git-520d7e278cfd25057e883575060b7378dfab61dc.tar.gz
git-520d7e278cfd25057e883575060b7378dfab61dc.tar.bz2
Merge branch 'maint'
* maint: Documentation/git-reset.txt: suggest git commit --amend in example. Build RPM with ETC_GITCONFIG=/etc/gitconfig Ignore all man sections as they are generated files. Fix typo in git-am: s/Was is/Was it/ Reverse the order of -b and --track in the man page. dir.c(common_prefix): Fix two bugs Conflicts: git.spec.in
Diffstat (limited to 'git.spec.in')
-rw-r--r--git.spec.in2
1 files changed, 2 insertions, 0 deletions
diff --git a/git.spec.in b/git.spec.in
index f0746ed..556bdda 100644
--- a/git.spec.in
+++ b/git.spec.in
@@ -96,12 +96,14 @@ Perl interface to Git
%build
make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" WITH_P4IMPORT=YesPlease \
+ ETC_GITCONFIG=/etc/gitconfig \
prefix=%{_prefix} PYTHON_PATH=%{python_path} all %{!?_without_docs: doc}
%install
rm -rf $RPM_BUILD_ROOT
make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" DESTDIR=$RPM_BUILD_ROOT \
WITH_P4IMPORT=YesPlease prefix=%{_prefix} mandir=%{_mandir} \
+ ETC_GITCONFIG=/etc/gitconfig \
PYTHON_PATH=%{python_path} \
INSTALLDIRS=vendor install %{!?_without_docs: install-doc}
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'