summaryrefslogtreecommitdiff
path: root/git.spec.in
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-12-12 22:00:24 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-12-13 01:41:58 (GMT)
commit39bf13f2d6aaec6ff34bf367f2497fc9247c721f (patch)
tree785d7ce8f4f4eda9932fbc3a1f8ff92944bd73d6 /git.spec.in
parent22c9071728cdc4c5b39e4fc6a33036d967d3a3a5 (diff)
downloadgit-39bf13f2d6aaec6ff34bf367f2497fc9247c721f.zip
git-39bf13f2d6aaec6ff34bf367f2497fc9247c721f.tar.gz
git-39bf13f2d6aaec6ff34bf367f2497fc9247c721f.tar.bz2
RPM spec: Adjust htmldir
git help -w needs to know the right location of installed pages. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git.spec.in')
-rw-r--r--git.spec.in12
1 files changed, 8 insertions, 4 deletions
diff --git a/git.spec.in b/git.spec.in
index d94bf6a..3e5bebb 100644
--- a/git.spec.in
+++ b/git.spec.in
@@ -83,19 +83,20 @@ BuildRequires: perl(Error)
%description -n perl-Git
Perl interface to Git
+%define path_settings ETC_GITCONFIG=/etc/gitconfig prefix=%{_prefix} mandir=%{_mandir} htmldir=%{_docdir}/%{name}-core-%{version}
+
%prep
%setup -q
%build
make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \
- ETC_GITCONFIG=/etc/gitconfig \
- prefix=%{_prefix} all %{!?_without_docs: doc}
+ %{path_settings} \
+ all %{!?_without_docs: doc}
%install
rm -rf $RPM_BUILD_ROOT
make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" DESTDIR=$RPM_BUILD_ROOT \
- prefix=%{_prefix} mandir=%{_mandir} \
- ETC_GITCONFIG=/etc/gitconfig \
+ %{path_settings} \
INSTALLDIRS=vendor install %{!?_without_docs: install-doc}
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';'
@@ -171,6 +172,9 @@ rm -rf $RPM_BUILD_ROOT
%{!?_without_docs: %doc Documentation/technical}
%changelog
+* Wed Dec 12 2007 Junio C Hamano <gitster@pobox.com>
+- Adjust htmldir to point at /usr/share/doc/git-core-$version/
+
* Sun Jul 15 2007 Sean Estabrooks <seanlkml@sympatico.ca>
- Removed p4import.