From c256c4a6d2c9d9039924ef5fcdcbf4e802ed19c9 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Thu, 7 Aug 2008 16:42:16 +0200 Subject: Add comment about versioned vs unversioned docs to systemtap.spec. --- ChangeLog | 4 ++++ systemtap.spec | 8 +++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 88de8c62..470cdda4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2008-08-07 Mark Wielaard + + * systemtap.spec: Add comment about versioned vs unversioned docs. + 2008-08-06 Frank Ch. Eigler * stap-find-servers (match_server, client_sysinfo): diff --git a/systemtap.spec b/systemtap.spec index 503022d1..e5bd22f5 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -135,7 +135,10 @@ make %{?_smp_mflags} rm -rf ${RPM_BUILD_ROOT} make DESTDIR=$RPM_BUILD_ROOT install -# We want the examples in the special doc dir, not the generoc doc install dir. +# We want the examples in the special doc dir, not the build install dir. +# We build it in place and then move it away so it doesn't get installed +# twice. rpm can specify itself where the (versioned) docs go with the +# %doc directive. mv $RPM_BUILD_ROOT%{_datadir}/doc/systemtap/examples examples # Fix paths in the example & testsuite scripts @@ -155,6 +158,9 @@ cp -rp testsuite $RPM_BUILD_ROOT%{_datadir}/systemtap #%if %{with_docs} # We want the manuals in the special doc dir, not the generic doc install dir. +# We build it in place and then move it away so it doesn't get installed +# twice. rpm can specify itself where the (versioned) docs go with the +# %doc directive. mkdir docs.installed mv $RPM_BUILD_ROOT%{_datadir}/doc/systemtap/*.pdf docs.installed/ #%endif -- cgit