From 39bf13f2d6aaec6ff34bf367f2497fc9247c721f Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 12 Dec 2007 14:00:24 -0800 Subject: [PATCH] RPM spec: Adjust htmldir git help -w needs to know the right location of installed pages. Signed-off-by: Junio C Hamano --- git.spec.in | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/git.spec.in b/git.spec.in index d94bf6ad9..3e5bebba0 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 +- Adjust htmldir to point at /usr/share/doc/git-core-$version/ + * Sun Jul 15 2007 Sean Estabrooks - Removed p4import. -- 2.30.2