@matheusbsbs / matheus-bagliano / commits / 39bf13f2d6
Fork 0

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>

Junio C Hamano committed Dec 12, 2007 at 14:00 UTC 39bf13f2d6aaec6ff34bf367f2497fc9247c721f
1 file changed +8 -4
git.spec.in
+8 -4
@@ -83,19 +83,20 @@ BuildRequires: perl(Error)
83 %description -n perl-Git
84 Perl interface to Git
85
86 +%define path_settings ETC_GITCONFIG=/etc/gitconfig prefix=%{_prefix} mandir=%{_mandir} htmldir=%{_docdir}/%{name}-core-%{version}
87 +
88 %prep
89 %setup -q
90
91 %build
92 make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \
91 - ETC_GITCONFIG=/etc/gitconfig \
92 - prefix=%{_prefix} all %{!?_without_docs: doc}
93 + %{path_settings} \
94 + all %{!?_without_docs: doc}
95
96 %install
97 rm -rf $RPM_BUILD_ROOT
98 make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" DESTDIR=$RPM_BUILD_ROOT \
97 - prefix=%{_prefix} mandir=%{_mandir} \
98 - ETC_GITCONFIG=/etc/gitconfig \
99 + %{path_settings} \
100 INSTALLDIRS=vendor install %{!?_without_docs: install-doc}
101 find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
102 find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';'
@@ -171,6 +172,9 @@ rm -rf $RPM_BUILD_ROOT
172 %{!?_without_docs: %doc Documentation/technical}
173
174 %changelog
175 +* Wed Dec 12 2007 Junio C Hamano <gitster@pobox.com>
176 +- Adjust htmldir to point at /usr/share/doc/git-core-$version/
177 +
178 * Sun Jul 15 2007 Sean Estabrooks <seanlkml@sympatico.ca>
179 - Removed p4import.
180